projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: eb43720 46674d3)
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authormasensio <masensio@solidgear.es>
Tue, 27 Aug 2013 10:15:06 +0000 (12:15 +0200)
committermasensio <masensio@solidgear.es>
Tue, 27 Aug 2013 10:15:06 +0000 (12:15 +0200)
commitda77406209034d1f078a6ab1c0df1f63ed86726b
tree8d7d9d73ca91dce1624d0a163bf8646b66567a8dtree | snapshot (tar.gz tar.bz2 zip)
parenteb437200aa572a98b947ceac0a1b50972a6be6c6commit | diff
parent46674d32feb896ca8fb7dd40f25c100e167aec22commit | diff
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired

Conflicts:
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/authentication/AuthenticatorActivity.java diff1 | diff2 | blob | history
ownCloud Android App