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

Merge branch 'gradleWithInternalDependency' into us4_view_text_files 

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