Merge remote-tracking branch 'origin/develop'
# Conflicts: # Nextcloud.xcodeproj/project.pbxproj # iOSClient/AppDelegate.m # 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/de.lproj/Localizable.strings # iOSClient/Supporting Files/el.lproj/Localizable.strings # iOSClient/Supporting Files/eu.lproj/Localizable.strings # iOSClient/Supporting Files/fr.lproj/Localizable.strings # iOSClient/Supporting Files/hu.lproj/Localizable.strings # iOSClient/Supporting Files/nl.lproj/Localizable.strings # iOSClient/Supporting Files/pt-BR.lproj/Localizable.strings # iOSClient/Supporting Files/pt-PT.lproj/Localizable.strings
Please register or sign in to comment