Skip to content
Commit ef8ba663 authored by Marino Faggiana's avatar Marino Faggiana Committed by Marino Faggiana
Browse files

Merge branch 'develop' 

Conflicts:
	.gitignore
	iOSClient/Supporting Files/fr.lproj/Localizable.strings
	iOSClient/Supporting Files/nl.lproj/Localizable.strings
	iOSClient/Supporting Files/sk-SK.lproj/Localizable.strings
parents da354cc7 c30f153a
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