t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote...
authormasensio <masensio@solidgear.es>
Mon, 18 Nov 2013 13:42:07 +0000 (14:42 +0100)
committermasensio <masensio@solidgear.es>
Mon, 18 Nov 2013 13:42:07 +0000 (14:42 +0100)
commit515ec5e8dd751956264dffdb1b5db65eda0aed8a
tree10742fe43d1d0aad8fc5ff8c419b68580f5ab0bc
parentf780062616bd9fec5eae37affff04d697befc795
parent3cd9b0dc1c1833bcf7f0d1e5fe0dbedd34e05861
t puswqMerge branch 'refactor_remote_operation_to_create_folder' into refactor_remote_operation_to_rename_folder

Conflicts:
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java
oc_framework-test-project/oc_framework-test-test/src/com/owncloud/android/oc_framework_test_project/test/CreateFolderTest.java
oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
oc_framework/src/com/owncloud/android/oc_framework/operations/remote/RenameRemoteFileOperation.java
src/com/owncloud/android/files/services/FileUploader.java
src/com/owncloud/android/ui/activity/FileDisplayActivity.java
src/com/owncloud/android/ui/fragment/FileDetailFragment.java