Skip to content
GitLab
Explore
Sign in
Commit
053aad5a
authored
Apr 04, 2013
by
David A. Velasco
Browse files
Merge branch 'bug_hunting' into feature_previews
Conflicts: src/com/owncloud/android/ui/activity/FileDisplayActivity.java
parents
77ddd1cc
97ae9007
Changes
37
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