Skip to content
Commit 71347b48 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:
	src/com/owncloud/android/ui/dialog/SamlWebViewDialog.java
parents 2dc5cc57 3072a297
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