Skip to content
Commit 8215c5cc authored by masensio's avatar 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
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment