Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 22 Oct 2015 11:03:53 +0000 (13:03 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 22 Oct 2015 11:03:53 +0000 (13:03 +0200)
commit426693b37d0c37c8d4de68ebb891108ac3a69603
tree0c11571965b083fb1b6095cb88df9422d6c6d750
parent5695c5c038f9c8347ec4a06dd2fab9655680468f
parent08443f90c58f014a25cc86007844a45e829f4d3a
Merge branch 'master' of https://github.com/owncloud/android into material_fab
res/layout/account_setup.xml
res/values/colors.xml