Merge branch 'develop' into setup_buttons
authorDavid A. Velasco <dvelasco@solidgear.es>
Wed, 6 Nov 2013 10:43:22 +0000 (11:43 +0100)
committerDavid A. Velasco <dvelasco@solidgear.es>
Wed, 6 Nov 2013 10:43:22 +0000 (11:43 +0100)
commita0efedc99d0421554b8f8e93ef631e54a4cb05cd
tree23a009ac8692b74a307a83e78080e77745c7cb21
parent850a3dd09a8b04e4cb4b83f7c7e9c302f03ca669
parent38baf42813463596bea4def163f395aabdc0b63b
Merge branch 'develop' into setup_buttons
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/values/setup.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java