Christophe Matthieu 5ec3d91cf7 [MERGE] from trunk ...

bzr revid: chm@openerp.com-20140214133607-0pdcfyxvuqwsway6

2014-02-14 14:36:07 +01:00

..

ir_actions.xml

[IMP] website: server action: display website_url in tree view

2014-02-07 13:33:01 +01:00

res_config.xml

[IMP] website: res_config

2014-01-27 19:00:59 +01:00

snippets.xml

[IMP] Pantone colors of the year

2014-02-11 09:54:50 +01:00

themes.xml

[IMP] website themes: simpler wording

2014-01-31 09:48:21 +01:00

website_templates.xml

[IMP] website: remove bootstrap in addons/website and use bootstrap from web

2014-02-11 12:04:57 +01:00

website_views.xml

[IMP] website: res_config with wizard

2014-01-27 18:38:16 +01:00