From: masensio Date: Thu, 14 Nov 2013 16:23:25 +0000 (+0100) Subject: Merge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operat... X-Git-Tag: oc-android-1.5.5~123^2~9 X-Git-Url: http://git.linex4red.de/pub/Android/ownCloud.git/commitdiff_plain/f299079851589e2af2d4aa93a77eecda6438b004?ds=inline;hp=f299079851589e2af2d4aa93a77eecda6438b004 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 ---