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

Merge branch 'develop' 

Conflicts:
	Cartfile
	Cartfile.resolved
	Nextcloud.xcodeproj/project.pbxproj
	iOSClient/Main/Main.storyboard
parents d5e38920 538891d9
Hide whitespace changes
Inline Side-by-side
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