Skip to content
GitLab
Explore
Sign in
Commit
44e32881
authored
Jan 07, 2014
by
masensio
Browse files
Merge branch 'develop' into refactor_remote_operation_to_read_file
Conflicts: src/com/owncloud/android/utils/FileStorageUtils.java
parents
772721ab
72f6313d
Loading
Loading
Loading
Changes
55
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