Skip to content
Unverified Commit 2cde5662 authored by Henrik Storch's avatar Henrik Storch
Browse files

Merge branch 'develop' 



Signed-off-by: default avatarHenrik Storch <henrik.storch@nextcloud.com>

Conflicts:
	Nextcloud.xcodeproj/project.pbxproj
	iOSClient/Menu/NCMenu.swift
parents 42ca079f 5e304a4e
Expand all 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