Merge pull request #1219 from owncloud/sync_full_folder__fix_conflict_save_local_version
[pub/Android/ownCloud.git] / user_manual /
drwxr-xr-x   ..
-rw-r--r-- 6270 Makefile
-rw-r--r-- 4720 android_app.rst
-rw-r--r-- 9650 conf.py
drwxr-xr-x - images
-rw-r--r-- 121 index.rst
-rw-r--r-- 5353 make.bat
m--------- - ocdoc