Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 10:59:39 +0000 (12:59 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 19 Oct 2015 10:59:39 +0000 (12:59 +0200)
commitd0e73f432133bdbe3c46e12beff15059769eff37
treeca873e67f91148220eeb481505f71c45c17a72b6
parent0e6920c8787c16791f737f28bad678f806c7e5c7
parentd1dfc9958ddd4d72878f48a4e4b4247320780e81
Merge branch 'master' of https://github.com/owncloud/android into material_fab