diff options
| author | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2014-05-14 15:13:04 +0200 |
| commit | f4d78ae738e474abd4e77dc8fc6cdf8a668a5d72 (patch) | |
| tree | a02d0dedc047ff296517530b50a33556e5d4f6c7 /addons/website_mail/data | |
| parent | 9d9cfd585f56bf64126e7316ea60ea5131a02059 (diff) | |
| parent | 4f5cc00420c6af5430ac921e89f217dcedaa1b8f (diff) | |
Merge branch 'server-trunk'
Conflicts:
addons/mass_mailing/controllers/main.py
Diffstat (limited to 'addons/website_mail/data')
| -rw-r--r-- | addons/website_mail/data/mail_groups.xml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/website_mail/data/mail_groups.xml b/addons/website_mail/data/mail_groups.xml index b5d037ca866..0bc8d3e81d1 100644 --- a/addons/website_mail/data/mail_groups.xml +++ b/addons/website_mail/data/mail_groups.xml @@ -3,9 +3,9 @@ <data noupdate="1"> <record model="mail.group" id="group_all_employees"> - <field name="name">Discussion Group</field> + <field name="name">Newsletter</field> <field name="public">public</field> - <field name="description">Public Discussion Group</field> + <field name="description">Public Newsletter.</field> </record> </data> |