Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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
- Loading branch information