Merge branch 'master' of https://github.com/owncloud/android into material_fab
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:10 +0000 (16:31 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:31:10 +0000 (16:31 +0200)
commit932963d8584cf5391b46f769f86620cee3489ddf
tree807052753e9dc7667841d2ec06cdfe348f04b14c
parent6ed679cc3f7402457a4b9618b43545c3c4bb7f82
parent459bd1e9d08a625052e6f3d4c71503d39aa4b6af
Merge branch 'master' of https://github.com/owncloud/android into material_fab

Conflicts:
res/layout/list_item.xml
owncloud-android-library