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

Merge remote-tracking branch 'upstream/develop' into us4_view_text_files 

Conflicts:
	src/com/owncloud/android/ui/activity/FileDisplayActivity.java
parents d5566ce0 50e39f04
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