diff options
| author | Thibault Delavallée <tde@openerp.com> | 2013-05-22 13:42:36 +0200 |
|---|---|---|
| committer | Thibault Delavallée <tde@openerp.com> | 2013-05-22 13:42:36 +0200 |
| commit | cd278d83abd291209d7c3f18ee8eb9ab43a4158a (patch) | |
| tree | 8d866ce7e1d365667e0a4fe9e85b10f15d36ea3d /addons/mail/data/mail_data.xml | |
| parent | c1cb8bf7653d98153c43e0ee35eb3558438e0b78 (diff) | |
| parent | d4d6e882668cfdc7c4634a0e30a047d0c83c75a7 (diff) | |
[MERGE] Sync with trunk
bzr revid: tde@openerp.com-20130522103305-yi5ql1chdx9qxxlx
bzr revid: tde@openerp.com-20130522114236-qi2s3i2dl2lemdvh
Diffstat (limited to 'addons/mail/data/mail_data.xml')
| -rw-r--r-- | addons/mail/data/mail_data.xml | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/addons/mail/data/mail_data.xml b/addons/mail/data/mail_data.xml index 02cfd626768..4e935e4aa88 100644 --- a/addons/mail/data/mail_data.xml +++ b/addons/mail/data/mail_data.xml @@ -40,6 +40,12 @@ <field name="args">()</field> </record> + <!-- Catchall Email Alias --> + <record id="icp_mail_catchall_alias" model="ir.config_parameter"> + <field name="key">mail.catchall.alias</field> + <field name="value">catchall</field> + </record> + <!-- Discussion subtype for messaging / Chatter --> <record id="mt_comment" model="mail.message.subtype"> <field name="name">Discussions</field> |