Skip to content
Commit 5aaa4e10 authored by masensio's avatar masensio
Browse files

Merge branch 'develop' into refactor_remote_operation_to_read_folder 

Conflicts:
	oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
parents 40798f69 910c8a7b
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