Thibault Delavallée 9cf78e93cc [MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files. ...

bzr revid: tde@openerp.com-20140116103910-qmm2y6kucmngplnk

2014-01-16 11:39:10 +01:00

..

__init__.py

[ADD] email_template: added support for 'email' server action.

2013-07-15 17:25:16 +02:00

test_ir_actions.py

[MERGE] Forward-port of latest 7.0 bugfixes, up to rev. 9718 rev-id: dle@openerp.com-20131224103535-rhtje7dnq1ie7jtb

2013-12-24 12:24:07 +01:00

test_mail.py

[MERGE] Sync with trunk, tries to solve conflicts. There are still some new images to convert into images in xml files.

2014-01-16 11:39:10 +01:00