Merge remote-tracking branch 'remotes/upstream/master' into beta
-rw-r--r-- 466 .classpath
-rw-r--r-- 728 .gitignore
-rw-r--r-- 254 .gitmodules
-rw-r--r-- 819 .project
drwxr-xr-x - .settings
-rw-r--r-- 286 .travis.yml
drwxr-xr-x - .tx
-rw-r--r-- 9737 AndroidManifest.xml
-rw-r--r-- 2599 CHANGELOG.md
-rw-r--r-- 3802 CONTRIBUTING.md
-rw-r--r-- 18029 LICENSE.txt
-rw-r--r-- 1415 README.md
-rw-r--r-- 10677 SETUP.md
-rw-r--r-- 2784 THIRD_PARTY.txt
-rw-r--r-- 4451120 android-release.apk
drwxr-xr-x - apks
drwxr-xr-x - automationTest
-rw-r--r-- 2439 build.gradle
-rw-r--r-- 3499 build.xml
drwxr-xr-x - doc
drwxr-xr-x - gradle
-rwxr-xr-x 5080 gradlew
-rw-r--r-- 2404 gradlew.bat
-rw-r--r-- 422 issue_template.md
drwxr-xr-x - libs
drwxr-xr-x - oc_jb_workaround
m--------- - owncloud-android-library
-rw-r--r-- 4878 pom.xml
-rw-r--r-- 1151 proguard.cfg
-rw-r--r-- 575 project.properties
drwxr-xr-x - res
-rw-r--r-- 48 settings.gradle
-rw-r--r-- 1390 setup_env.bat
-rwxr-xr-x 1407 setup_env.sh
drwxr-xr-x - src
drwxr-xr-x - tests
drwxr-xr-x - third_party
drwxr-xr-x - user_manual