Merge commit 'refs/pr/707' into text_file_preview_pr_707_with
authormasensio <masensio@solidgear.es>
Wed, 5 Aug 2015 14:48:12 +0000 (16:48 +0200)
committermasensio <masensio@solidgear.es>
Wed, 5 Aug 2015 14:48:12 +0000 (16:48 +0200)
commitb694fee63d7bdb8b93e9d46d28303eff094923fe
tree7d9edb23d5fb0016b3b952f87ee3ff96afce5cbb
parent9a0361945c3028490381d86b32d7be21662005f4
parentefbab82a6e21eeebe2f25a86d48fd56a4812e26f
Merge commit 'refs/pr/707' into text_file_preview_pr_707_with

Conflicts:
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
build.gradle
res/layout/file_preview.xml
src/com/owncloud/android/datamodel/OCFile.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/OCFileListFragment.java
src/com/owncloud/android/ui/preview/PreviewTextFragment.java