diff options
| author | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
|---|---|---|
| committer | Amit Bhavsar (Open ERP) <amb@tinyerp.com> | 2013-05-28 14:49:41 +0530 |
| commit | 24848a8dccf0b8acc77b2e9fd007f613bbf1736b (patch) | |
| tree | 343ca29c494e3310c1d6fa4b4f2e97a396e21c8e /addons/mail/data/mail_data.xml | |
| parent | 1b08798b52df8f0a3a72d116577cd7451b45b30c (diff) | |
| parent | 814a121dabbbe45a1c9ee671222b3a2bf261059a (diff) | |
[MERGE] merge with latest trunk
bzr revid: bde@tinyerp.com-20130522095432-1sl1b6uu6ewod4md
bzr revid: amb@tinyerp.com-20130528091941-wak8fnembuvewwjf
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> |