Skip to content
GitLab
Explore
Sign in
Commit
da774062
authored
Aug 27, 2013
by
masensio
Browse files
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
Conflicts: src/com/owncloud/android/authentication/AuthenticatorActivity.java
parents
eb437200
46674d32
Changes
1
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment