Merge branch 'develop' into refactor_remote_operation_to_download_file
Conflicts: oc_framework-test-project/AndroidManifest.xml oc_framework-test-project/src/com/owncloud/android/oc_framework_test_project/TestActivity.java
Loading
Please register or sign in to comment