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)
commit1f964a79ddb432dbba44198d20a77d6a3d1f9600
tree018ff18241ca7c03fa7a40bc919583f4cd221b27
parent99d7e189168fb85dda899d218ecfb3bd03a7f478
parenta601a0e06ecf5b3216fa5a21009c0f1f3bf16cb2
Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail

Conflicts:
src/com/owncloud/android/ui/fragment/FileDetailFragment.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java