Conflicts:
	CHANGELOG.md
	Cartfile
	Nextcloud.xcodeproj/project.pbxproj
	iOSClient/AppDelegate.m
	iOSClient/Brand/File_Provider_Extension.plist
	iOSClient/Brand/Share.plist
	iOSClient/Brand/iOSClient.plist
	iOSClient/Networking/OCNetworking.m
	iOSClient/Notification/CCNotification.swift
	iOSClient/Supporting Files/ca.lproj/Localizable.strings