mirror of
https://github.com/nextcloud/android.git
synced 2024-11-23 21:55:48 +03:00
📱 Nextcloud Android app
c3ca5b5a4f
Conflicts: AndroidManifest.xml res/menu/main_menu.xml src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/InstantUploadService.java src/com/owncloud/android/operations/SynchronizeFileOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDetailActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/activity/UploadFilesActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.java src/com/owncloud/android/ui/fragment/OCFileListFragment.java src/eu/alefzero/webdav/ChunkFromFileChannelRequestEntity.java src/eu/alefzero/webdav/FileRequestEntity.java src/eu/alefzero/webdav/WebdavClient.java |
||
---|---|---|
.settings | ||
.tx | ||
actionbarsherlock@9598f2bb2c | ||
doc | ||
libs | ||
oc_jb_workaround | ||
res | ||
src | ||
tests | ||
third_party | ||
.classpath | ||
.gitignore | ||
.gitmodules | ||
.project | ||
AndroidManifest.xml | ||
build.xml | ||
CONTRIBUTING.md | ||
issue_template.md | ||
LICENSE.txt | ||
pom.xml | ||
proguard.cfg | ||
project.properties | ||
README.md | ||
SETUP.md | ||
setup_env.bat | ||
setup_env.sh | ||
THIRD_PARTY.txt |