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

Merge branch 'develop' 

Conflicts:
	Nextcloud.xcodeproj/project.pbxproj
parents 718c41e6 3c57ec66
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