Skip to content

Commit a4a2f94

Browse files
committed
Merge branch 'master' into release/9.11
# Conflicts: # MEGA.xcodeproj/project.pbxproj # iMEGA/Languages/Base.lproj/Localizable.strings # iMEGA/Languages/ar.lproj/Localizable.strings # iMEGA/Languages/de.lproj/Localizable.strings # iMEGA/Languages/en.lproj/Localizable.strings # iMEGA/Languages/es.lproj/Localizable.strings # iMEGA/Languages/fr.lproj/Localizable.strings # iMEGA/Languages/id.lproj/Localizable.strings # iMEGA/Languages/it.lproj/Localizable.strings # iMEGA/Languages/ja.lproj/Localizable.strings # iMEGA/Languages/ko.lproj/Localizable.strings # iMEGA/Languages/nl.lproj/Localizable.strings # iMEGA/Languages/pl.lproj/Localizable.strings # iMEGA/Languages/pt.lproj/Localizable.strings # iMEGA/Languages/ro.lproj/Localizable.strings # iMEGA/Languages/ru.lproj/Localizable.strings # iMEGA/Languages/th.lproj/Localizable.strings # iMEGA/Languages/vi.lproj/Localizable.strings # iMEGA/Languages/zh-Hans.lproj/Localizable.strings # iMEGA/Languages/zh-Hant.lproj/Localizable.strings # iMEGA/SwiftGen/Strings+Generated.swift # iMEGA/Vendor/SDK
2 parents e5a7464 + ee9bdf6 commit a4a2f94

File tree

1 file changed

+1
-0
lines changed
  • iMEGA/Vendor

1 file changed

+1
-0
lines changed

iMEGA/Vendor/SDK

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Subproject commit 4c3260c9b1c448f1da7f91ae8de3331638599813

0 commit comments

Comments
 (0)