masensio 1f964a79dd Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail ... Conflicts: src/com/owncloud/android/ui/fragment/FileDetailFragment.java		2015-10-15 16:10:55 +02:00
..
com/owncloud/android	Merge branch 'detailThumbnail' of git://github.com/zmatsuo/android into zmatsuo-detailThumbnail	2015-10-15 16:10:55 +02:00
third_parties	Enforce to recalculate row height when measuring the footer to get it correctly placed in the grid view	2015-08-10 11:12:43 +02:00