Skip to content
GitLab
Explore
Sign in
Commit
a0707428
authored
Sep 02, 2015
by
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
Changes
930
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