Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 10:47:01 +0000 (12:47 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 10:47:01 +0000 (12:47 +0200)
commit13a73dd56872b6fcbc12ab8c62806cbfd48dc93b
treeabde5376551d9900ccabc900120e4ae5a9ec1fe0
parent0234ca22ea2422f49cb453e8f3030a699cdd94bd
parent7182b1d2b13ac7182ef9df2d6bb46657b8d2417b
Merge branch 'master' of https://github.com/owncloud/android into material_buttons