Skip to content
Commit fc41a912 authored by marinofaggiana's avatar marinofaggiana
Browse files

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
parents 2720ed4a e65d4a86
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment