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

Merge remote-tracking branch 'origin/master' into text_file_preview_pr_707_with_develop 

Conflicts:
	res/layout/file_preview.xml
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
parents fafc422c f626b136
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