Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detai...
authormasensio <masensio@solidgear.es>
Thu, 15 Oct 2015 14:10:55 +0000 (16:10 +0200)
committermasensio <masensio@solidgear.es>
Thu, 15 Oct 2015 14:10:55 +0000 (16:10 +0200)
Conflicts:
src/com/owncloud/android/ui/fragment/FileDetailFragment.java


No differences found