Skip to content
Commit 44e32881 authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into refactor_remote_operation_to_read_file 

Conflicts:
	src/com/owncloud/android/utils/FileStorageUtils.java
parents 772721ab 72f6313d
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