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
Please register or sign in to comment