Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 12:37:14 +0000 (14:37 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 23 Aug 2013 12:37:14 +0000 (14:37 +0200)
commitdc02769e492205edce2a206cafe47152d526c09b
tree6778ee29f3b2e9e8966203c8579d3296ece79804
parent43660cb8bd43938bec7ed8529b2bbbde64acbe8f
parentea5cd96679e66b81f9789b5667eecfc99846de1a
Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_sign_on_expired
res/layout-land/account_setup.xml
res/layout/account_setup.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java