Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 25 Sep 2015 14:09:01 +0000 (16:09 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 25 Sep 2015 14:09:01 +0000 (16:09 +0200)
commit5417b2a4e5114686aa1f9fadb55a6d464947acb8
tree3931dda2b264ff79df72e11b6168d8ffd500e8e1
parentde13ecc4e3e15c4617f0a8e72e196ffad6a2e31a
parenta38461aaa52e4c2136695bcea47732c09291b8ef
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_buttons
res/layout/account_setup.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java