mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 17:46:37 +03:00
39c2fffbfe
Conflicts: oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteFile.java oc_framework/src/com/owncloud/android/oc_framework/operations/RemoteOperationResult.java oc_framework/src/com/owncloud/android/oc_framework/utils/FileUtils.java src/com/owncloud/android/operations/SynchronizeFolderOperation.java |
||
---|---|---|
.. | ||
.settings | ||
res | ||
src/com/owncloud/android/oc_framework_test_project/test | ||
.classpath | ||
.project | ||
AndroidManifest.xml | ||
project.properties |