masensio dc0aea30f0 Merge branch 'master' into reliable_uploads ... Conflicts: AndroidManifest.xml res/values/strings.xml src/com/owncloud/android/datamodel/OCFile.java src/com/owncloud/android/db/ProviderMeta.java src/com/owncloud/android/files/FileMenuFilter.java src/com/owncloud/android/files/FileOperationsHelper.java src/com/owncloud/android/files/InstantUploadBroadcastReceiver.java src/com/owncloud/android/files/services/FileUploader.java src/com/owncloud/android/operations/SynchronizeFolderOperation.java src/com/owncloud/android/operations/UploadFileOperation.java src/com/owncloud/android/ui/activity/FileDisplayActivity.java src/com/owncloud/android/utils/FileStorageUtils.java		2015-12-10 17:18:52 +01:00
..
images	update for 1.9 release w expanded sharing	2015-12-04 14:27:19 -08:00
ocdoc@343496c792	update submodule & integrate new theme changes	2015-12-07 16:48:21 -08:00
android_app.rst	update for 1.9 release w expanded sharing	2015-12-04 14:27:19 -08:00
conf.py	update version number in conf.py	2015-12-04 14:37:20 -08:00
index.rst	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00
make.bat	Add Android app manual to develop branch, and Allow building manual in owncloud themes	2015-01-27 12:07:43 -08:00
Makefile	Add means to build user manual via make	2015-01-27 23:40:53 +01:00