Merge branch 'master' of https://github.com/owncloud/android into material_buttons
authorAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:27:47 +0000 (16:27 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Wed, 16 Sep 2015 14:27:47 +0000 (16:27 +0200)
commit94bc0699ace6ada85bcd52eef72434fb75bd882f
tree7cb595ee8b4abedfee12edf351ce6610bca16c93
parent9e15d2459d4280666e2fbc99d67326f680bf392b
parent459bd1e9d08a625052e6f3d4c71503d39aa4b6af
Merge branch 'master' of https://github.com/owncloud/android into material_buttons
fixed realignment item badges
Conflicts:
res/layout/list_item.xml
owncloud-android-library
res/layout/list_item.xml