Merge branch 'develop' into branding_configurable_URL_input_field
authorDavid A. Velasco <dvelasco@solidgear.es>
Fri, 5 Jul 2013 09:52:24 +0000 (11:52 +0200)
committerDavid A. Velasco <dvelasco@solidgear.es>
Fri, 5 Jul 2013 09:52:24 +0000 (11:52 +0200)
commit233533faa3f74a0a82ace5191c81a3211658a62b
tree52f8cb8bfca56fc3263a8733e9a1fcdbb4a39849
parentb52f0484b4a2815f2373422bfc61beea2a985854
parent04c2311131508ed1c34f5a53d1016b04814dcdd8
Merge branch 'develop' into branding_configurable_URL_input_field
res/layout-land/account_setup.xml
res/layout/account_setup.xml
res/values/strings.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java