diff options
| author | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
|---|---|---|
| committer | Meera Trambadia (OpenERP) <mtr@tinyerp.com> | 2011-09-16 11:11:38 +0530 |
| commit | d979aad3de95ae24aa1db52cf17c4eecf3d3ce6b (patch) | |
| tree | 592698c8e0dab53fcd157dd456a800bd4a80b5bf /addons/email_template/__init__.py | |
| parent | eea80125f7d1c739260929fb1f38866ef21439e1 (diff) | |
| parent | d101d3fbaaffe2d0219ac6cfeef50338a2501664 (diff) | |
[MERGE] branch merged with lp:openobject-addons
bzr revid: mtr@tinyerp.com-20110916054138-93b3caomaij5dyp4
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: |