Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 11:00:15 +0000 (13:00 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 11:00:15 +0000 (13:00 +0200)
commitd64946f859af658597fd6706602a71336a72c08d
tree82de97842d781efdd201b056635fe897c63d9a70
parent30720e98a53c5a664631635c8799762b377bb915
parentd1dfc9958ddd4d72878f48a4e4b4247320780e81
Merge branch 'master' of https://github.com/owncloud/android into material_buttons