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

Merge branch 'refactor_remote_operation_to_create_folder' into...

Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

Conflicts:
	oc_framework/src/com/owncloud/android/oc_framework/operations/remote/CreateRemoteFolderOperation.java
parents 9b79ed71 15442976
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment