[FIX] bunch of changes lost in incorrect merge f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
authorXavier Morel <xmo@openerp.com>
Fri, 30 May 2014 15:00:52 +0000 (17:00 +0200)
committerXavier Morel <xmo@openerp.com>
Fri, 30 May 2014 15:00:52 +0000 (17:00 +0200)
commit46712acaecb58954f5dac375445e4556d45c5f0b
tree53b3763c98a95fd3e426481778013c17b65bf114
parent8d822419e74969ff032db653a3797affeccace1b
parentd325c0caef433cb50a7589a69b00650be3bed56e
[FIX] bunch of changes lost in incorrect merge f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72
addons/account_analytic_analysis/account_analytic_analysis.py
addons/account_analytic_analysis/account_analytic_analysis_view.xml
addons/website/models/ir_ui_view.py
addons/website_mail_group/static/src/js/website_mail_group.editor.js