Skip to content

Commit

Permalink
Merge branch 'master' into release/9.11
Browse files Browse the repository at this point in the history
# 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
  • Loading branch information
rgmez committed Apr 11, 2023
2 parents e5a7464 + ee9bdf6 commit a4a2f94
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions iMEGA/Vendor/SDK
Submodule SDK added at 4c3260

0 comments on commit a4a2f94

Please sign in to comment.