Skip to content
GitLab
Explore
Sign in
Commit
8215c5cc
authored
Dec 16, 2013
by
masensio
Browse files
Merge branch 'develop' into refactor_remote_operation_to_upload_file
Conflicts: src/com/owncloud/android/files/services/FileUploader.java
parents
e76d4b00
45c612fd
Loading
Loading
Loading
Changes
88
Hide whitespace changes
Inline
Side-by-side
Loading
Preview
0%
Loading
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