Skip to content
Commit b694fee6 authored by masensio's avatar masensio
Browse files

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
parents 9a036194 efbab82a
Expand all Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment