Merge branch 'saml_based_federated_single_sign_on' into saml_based_federated_single_s...
authorDavid A. Velasco <dvelasco@solidgear.es>
Thu, 22 Aug 2013 15:50:11 +0000 (17:50 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Thu, 22 Aug 2013 15:50:11 +0000 (17:50 +0200)
commit316a0a12ad4799ed0d43182a5b1b9bc04fbecee5
treedfaeda0bd7de6fd1d57ab22c7708f4ac2bf82b8e
parentdea37f653c4ec0e39ea3c8d30809996660b5816f
parentd7c6472bd3835903974d5928fde5bd365fa7ebcb
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
res/values/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java
src/com/owncloud/android/operations/RemoteOperationResult.java
src/eu/alefzero/webdav/WebdavClient.java