Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 22 Sep 2015 08:01:46 +0000 (10:01 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 22 Sep 2015 08:01:46 +0000 (10:01 +0200)
commitd3ffaa590b96bd2d0250cf833ea6ebdf4f52d2af
tree251f9e949e203b2b00db4e0551092d028e9898cd
parent85467a42205554970c5ee0752f6a262669497801
parent92c39be013c4b91e04c6f37363ce0d5d145fb733
Merge branch 'master' of https://github.com/owncloud/android into material_fab