diff options
| author | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
|---|---|---|
| committer | Frederic van der Essen <fva@openerp.com / fvdessen+o@gmail.com> | 2014-08-25 16:42:57 +0200 |
| commit | d7f93defb899b2b48a14d679e5dffffdb4a00eff (patch) | |
| tree | f8572183b480477622917a1f504cf49a8e202f6e /addons/mail/data/mail_group_data.xml | |
| parent | 2b67528fe9e366829d44d8aba756bc6e359b4c61 (diff) | |
| parent | 36146b3fadc47543f4b696ab75c31b3459afb15b (diff) | |
Merge branch 'master' into master-pos-new-payment-screen-fva
Conflicts:
addons/point_of_sale/point_of_sale.py
addons/point_of_sale/point_of_sale_view.xml
Diffstat (limited to 'addons/mail/data/mail_group_data.xml')
| -rw-r--r-- | addons/mail/data/mail_group_data.xml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/mail/data/mail_group_data.xml b/addons/mail/data/mail_group_data.xml index d61c883f447..707ba6f5589 100644 --- a/addons/mail/data/mail_group_data.xml +++ b/addons/mail/data/mail_group_data.xml @@ -14,7 +14,7 @@ <field name="res_id" ref="mail.group_all_employees"/> <field name="type">notification</field> <field name="subtype_id" ref="mail.mt_comment"/> - <field name="subject">Welcome to OpenERP!</field> + <field name="subject">Welcome to Odoo!</field> <field name="body"><![CDATA[<p>Your homepage is a summary of messages you received and key information about documents you follow.</p> <p>The top menu bar contains all applications you installed. You can use the <i>Settings</i> menu to install more applications, activate other features or give access to new users.</p> <p>To setup your preferences (name, email signature, avatar), click on the top right corner.</p>]]></field> |