Merge branch 'develop'
# Conflicts: # iOSClient/Brand/File_Provider_Extension.plist # iOSClient/Brand/Notification_Service_Extension.plist # iOSClient/Brand/Share.plist # iOSClient/Brand/iOSClient.plist # iOSClient/Supporting Files/cs-CZ.lproj/Localizable.strings # iOSClient/Supporting Files/da.lproj/Localizable.strings # iOSClient/Supporting Files/es-AR.lproj/Localizable.strings
Please register or sign in to comment