From: masensio Date: Thu, 15 Oct 2015 14:10:55 +0000 (+0200) Subject: Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detai... X-Git-Tag: oc-android-1.9^2~50^2~1^2^2 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/1f964a79ddb432dbba44198d20a77d6a3d1f9600?hp=1f964a79ddb432dbba44198d20a77d6a3d1f9600 Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail Conflicts: src/com/owncloud/android/ui/fragment/FileDetailFragment.java ---