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

Merge branch 'master' into text_file_preview_pr_707_with_develop 

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
	src/com/owncloud/android/ui/fragment/OCFileListFragment.java
parents 6b84d83b f787213c
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