diff options
| author | sgo@tinyerp.com <> | 2013-06-05 12:49:05 +0530 |
|---|---|---|
| committer | sgo@tinyerp.com <> | 2013-06-05 12:49:05 +0530 |
| commit | 6a3cdf718ce4f9bd2749bb75993cdbcfd86d3eb2 (patch) | |
| tree | 075af0421f75fd36ca9f5cd44551e58ffc73460a /addons/mail/data | |
| parent | 143b485baf8adb7936d7784e314ccd405d1b8c14 (diff) | |
| parent | 5cc8c30adfeccc6db22ebf7487b8e4ebdbe10423 (diff) | |
[MERGE]sync with trunk
bzr revid: sgo@tinyerp.com-20130605071905-o2ldzc6vxqnoe099
Diffstat (limited to 'addons/mail/data')
| -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> |