mirror of
https://github.com/nextcloud/android.git
synced 2024-11-27 09:39:25 +03:00
📱 Nextcloud Android app
2946d8dd69
Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/Uploader.java src/com/owncloud/android/authentication/AccountAuthenticator.java src/com/owncloud/android/authenticator/AuthenticationRunnable.java src/com/owncloud/android/authenticator/OnAuthenticationResultListener.java src/com/owncloud/android/authenticator/OnConnectCheckListener.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileDownloader.java src/com/owncloud/android/files/services/FileOperation.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/network/OwnCloudClientUtils.java src/com/owncloud/android/operations/RemoteOperationResult.java src/com/owncloud/android/operations/UpdateOCVersionOperation.java src/com/owncloud/android/syncadapter/FileSyncAdapter.java src/com/owncloud/android/ui/activity/AccountSelectActivity.java src/com/owncloud/android/ui/activity/AuthenticatorActivity.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/ui/fragment/FileDetailFragment.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 |