[MERGE] merged trunk.
[odoo/odoo.git] / doc /
drwxr-xr-x   ..
-rw-r--r-- 5713 Makefile
drwxr-xr-x - _static
drwxr-xr-x - _templates
drwxr-xr-x - _themes
drwxr-xr-x - api
-rw-r--r-- 8584 conf.py
-rw-r--r-- 118 index.rst
-rw-r--r-- 229 index.rst.inc
-rw-r--r-- 4523 make.bat
drwxr-xr-x - source
-rw-r--r-- 4701 test-framework.rst