Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia...
authorAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:20:26 +0000 (18:20 +0200)
committerAndy Scherzinger <info@andy-scherzinger.de>
Tue, 15 Sep 2015 16:20:26 +0000 (18:20 +0200)
commit8a43d9e9aa03191bab5d7f4a1a3729b63fca9b6a
tree7ec3f86f14f3a6bb7d3ad83d1f2f84501d0d1932
parent728590437134a90aede2bb9b641268fd0f467897
parenteaf249803cbecf9f593bc54fc4ac9ad3e4eb4724
Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_fab