[MERGE] addons 16 survey
[odoo/odoo.git] / doc / index.rst.inc
index 80873a6..31ac249 100644 (file)
@@ -5,13 +5,17 @@ OpenERP Server
 .. toctree::
    :maxdepth: 1
 
+   import
+   module-versioning
    test-framework
 
-New feature merges
-++++++++++++++++++
+Changed in 7.0
+++++++++++++++
 
 .. toctree::
    :maxdepth: 1
 
    api/user_img_specs
    api/need_action_specs
+   api/font_style
+   api/field_level_acl