Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Thu, 22 Oct 2015 11:05:06 +0000 (13:05 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Thu, 22 Oct 2015 11:05:06 +0000 (13:05 +0200)
commit5c1e6e59bac614ce2b428f949e8ad09022b60080
treea89266e178991fb83fc7e8766b79127ec6bc1d5f
parentd64946f859af658597fd6706602a71336a72c08d
parent08443f90c58f014a25cc86007844a45e829f4d3a
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
res/layout/account_setup.xml