Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_f...
authormasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 09:44:51 +0000 (11:44 +0200)
committermasensio <masensio@solidgear.es>
Wed, 16 Sep 2015 09:44:51 +0000 (11:44 +0200)
commit0083936d40ba55029daeee4f03f7bbb23411a75e
tree6a91f18f203bc05a6157da55c27214d6cd4f1678
parent4c0371f82b86e745f9a548f14251f34924956976
parentc6bc82d4fe3cd185d2faad1a5786eade5399102b
Merge branch 'fix_file_list_icon_alignment' of github.com:owncloud/android into fix_file_list_icon_alignment