Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 25 Sep 2015 14:08:24 +0000 (16:08 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 25 Sep 2015 14:08:24 +0000 (16:08 +0200)
commit7003995829cdad8ee607a13cf4c70e74bbd19b40
tree56eddcf21dc6d8cb92522e0e38d8a783a3629efa
parent97747c9ad3545679a05fff6e0dccad24f2dd2375
parenta38461aaa52e4c2136695bcea47732c09291b8ef
Merge branch 'release-1.8' of https://github.com/owncloud/android into material_fab
res/layout/account_setup.xml
src/com/owncloud/android/authentication/AuthenticatorActivity.java