Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:45:14 +0000 (18:45 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:45:14 +0000 (18:45 +0200)
commit6ed679cc3f7402457a4b9618b43545c3c4bb7f82
treea3f3cd2764e0736f82f5b680a9c2ed1087899f45
parentc1c7093486b8e3f9d3b3b18fd10d8e7e03a983f9
parent803f672663a3bd83aceac2c6bf1ac093acf7509d
Merge branch 'master' of https://github.com/owncloud/android into material_fab
SETUP.md