Thibault Delavallée 70ce1e5eb4 [FIX] Fixed forgotten conflict when merging trunk. ...

bzr revid: tde@openerp.com-20130314085315-m4didtupt20gmkyv

2013-03-14 09:53:15 +01:00

..

__init__.py

[IMP] Added missing vim mode lines

2011-11-22 09:51:38 +01:00

email_template_preview_view.xml

[FIX] email_template: change name value and concat test

2012-11-07 12:39:25 +01:00

email_template_preview.py

[IMP] use the openerp namespace.

2012-12-06 15:56:32 +01:00

mail_compose_message_view.xml

[REF] email_template: cleanup/remove obsolete fields on mail composition wizard: use_template is the default

2012-11-16 18:02:59 +01:00

mail_compose_message.py

[FIX] Fixed forgotten conflict when merging trunk.

2013-03-14 09:53:15 +01:00