From: Andy Scherzinger Date: Tue, 15 Sep 2015 16:20:26 +0000 (+0200) Subject: Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into materia... X-Git-Tag: beta-20151202~3^2~47 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/8a43d9e9aa03191bab5d7f4a1a3729b63fca9b6a?hp=--cc Merge branch 'new_filetype_icons' of https://github.com/owncloud/android into material_fab --- 8a43d9e9aa03191bab5d7f4a1a3729b63fca9b6a