Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 10:46:48 +0000 (12:46 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Fri, 11 Sep 2015 10:46:48 +0000 (12:46 +0200)
commitbee2bdff630dbe62e83481f931e4d5b6b5b81571
tree7cb64f73caae9affb1bf37ecad121edd2c5d8869
parentfb2ba72d43c3a73d44aaf78a30521898d1770629
parent7182b1d2b13ac7182ef9df2d6bb46657b8d2417b
Merge branch 'master' of https://github.com/owncloud/android into material_fab