Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Mon, 26 Oct 2015 12:56:35 +0000 (13:56 +0100)
committerAndy Scherzinger <info@andy-scherzinger.de>
Mon, 26 Oct 2015 12:56:35 +0000 (13:56 +0100)
commit707a7fb823c99eca6e52cc09ef051368812ed3ab
treec9faffd433d60ed7a421caa6cd6fe635a9817246
parent426693b37d0c37c8d4de68ebb891108ac3a69603
parent2702951056c4b2dc0e6c085088a467601b331c2d
Merge branch 'master' of https://github.com/owncloud/android into material_fab