Merge branch 'develop' (a5b2912a) · Commits · github / nextcloud / ios

Commit a5b2912a authored Oct 23, 2018 by

Marino Faggiana

Merge branch 'develop'

# Conflicts:
#	iOSClient/Brand/NCBrand.swift
#	iOSClient/Supporting Files/cs-CZ.lproj/BKPasscodeView.strings
#	iOSClient/Supporting Files/cs-CZ.lproj/Intro.strings

parents 36f86756 24d73b84

Hide whitespace changes

Inline Side-by-side

Some changes are not shown.

For a faster browsing experience, only 20 of 1000+ files are shown. Download one of the files below to see all changes.

Plain diff Email patch

Please register or to comment