Olivier Goffart 8bcd0261dc Merge remote-tracking branch 'origin/1.8' ... Conflicts: VERSION.cmake		2015-06-15 14:03:46 +02:00
..
images
ocdoc@a8fc638c26
scripts
advancedusage.rst
architecture.rst
autoupdate.rst
building.rst
CMakeLists.txt
conf.py.in
conffile.rst
faq.rst
glossary.rst
index.rst
installing.rst
introduction.rst
logo-blue.pdf
make.bat
navigating.rst
options.rst
owncloud.1.rst
owncloudcmd.1.rst
owncloudcmd.rst
troubleshooting.rst
visualtour.rst