Skip to content
Commit dea37f65 authored by masensio's avatar masensio
Browse files

Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired 

Conflicts:
	res/values-es/strings.xml
	src/com/owncloud/android/operations/SynchronizeFolderOperation.java
parents 7ed9e800 540d4e87
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