projects / pub / Android / ownCloud.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 2dc5cc5 3072a29)
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authormasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 11:42:07 +0000 (13:42 +0200)
committermasensio <masensio@solidgear.es>
Fri, 23 Aug 2013 11:42:07 +0000 (13:42 +0200)
commit71347b48a089a677d7799628abf4056bbd780d71
treed48c4533ec8ed94c96a804acb71782e3bfeffc05tree | snapshot (tar.gz tar.bz2 zip)
parent2dc5cc57f12cf2832f6b19ee52f87e9f1f313eaacommit | diff
parent3072a29730c5d3af409a7f0a0e07598caf3b36c3commit | diff
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
src/com/owncloud/android/authentication/AuthenticatorActivity.java diff1 | diff2 | blob | history
ownCloud Android App