Skip to content
GitLab
Explore
Sign in
Commit
10a12fb9
authored
Nov 24, 2014
by
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
Changes
24
Hide whitespace changes
Inline
Side-by-side
Preview
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment