Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 22 Sep 2015 08:01:14 +0000 (10:01 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 22 Sep 2015 08:01:14 +0000 (10:01 +0200)
commit66aede2b3c152924295dff718ca2b5e69dd9961b
treeacc6296828514f60c01be23152f7cd25b9a84697
parentafff8959d2785803650474b465021219ee69d624
parent92c39be013c4b91e04c6f37363ce0d5d145fb733
Merge branch 'master' of https://github.com/owncloud/android into material_buttons