diff options
| author | Stephane Wirtel <stw@openerp.com> | 2011-09-13 16:00:16 +0200 |
|---|---|---|
| committer | Stephane Wirtel <stw@openerp.com> | 2011-09-13 16:00:16 +0200 |
| commit | 2a59ce92e3ea35cca00a314d44556b522b3c2fa8 (patch) | |
| tree | 6e7eec2157a513284e6740a95f2e39b7f04aef79 /addons/email_template/__init__.py | |
| parent | 8a2bc42c3c45b4d3c94070a29fa76636256f3da7 (diff) | |
| parent | 2a40f9a4997eecc6f997ab0e43dc6334263b9cad (diff) | |
[MERGE] Email Framework - lp:~openerp-dev/openobject-addons/trunk-emails-unified
bzr revid: stw@openerp.com-20110913140016-zzfynrnjdaap0tfb
Diffstat (limited to 'addons/email_template/__init__.py')
| -rw-r--r-- | addons/email_template/__init__.py | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/addons/email_template/__init__.py b/addons/email_template/__init__.py index dd87232679d..97931ea8bd5 100644 --- a/addons/email_template/__init__.py +++ b/addons/email_template/__init__.py @@ -3,7 +3,7 @@ # # OpenERP, Open Source Management Solution # Copyright (C) 2009 Sharoon Thomas -# Copyright (C) 2010-2010 OpenERP SA (<http://www.openerp.com>) +# Copyright (C) 2010-Today OpenERP SA (<http://www.openerp.com>) # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -19,9 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/> # ############################################################################## - -import email_template_account import email_template -import email_template_mailbox import wizard +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |