Skip to content
Commit 073e7e46 authored by Jorge Antonio Diaz-Benito Soriano's avatar Jorge Antonio Diaz-Benito Soriano
Browse files

Merge branch 'us4_view_text_files' of github.com:owncloudChalmers/android into us4_view_text_files 

Conflicts:
	src/com/owncloud/android/datamodel/OCFile.java
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
parents b1ef5d94 46ff60a9
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