summaryrefslogtreecommitdiff
path: root/addons/mail/data/mail_shortcode_data.xml
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-10-21 15:22:36 +0200
committerChristophe Simonis <chs@odoo.com>2017-10-21 15:22:36 +0200
commitde987831da237ed5f9c96d50a9e51d083e072aa0 (patch)
treeef714d2d98693eae3446620d28bb48314573018a /addons/mail/data/mail_shortcode_data.xml
parentea2a976f31b2611b6b4ff69f4a5cdc2ffc7798fe (diff)
parentd70518d04f8f8061c8c683ea4ba8c95ae631ae45 (diff)
[MERGE] forward port branch 11.0 up to d70518d04f8
Diffstat (limited to 'addons/mail/data/mail_shortcode_data.xml')
-rw-r--r--addons/mail/data/mail_shortcode_data.xml4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/mail/data/mail_shortcode_data.xml b/addons/mail/data/mail_shortcode_data.xml
index 64f1aa7129f..afd0cf91146 100644
--- a/addons/mail/data/mail_shortcode_data.xml
+++ b/addons/mail/data/mail_shortcode_data.xml
@@ -103,8 +103,8 @@
</record>
<record id="mail_smiley_angry" model="mail.shortcode">
<field name="source">3:(</field>
- <field name="unicode_source">😈</field>
- <field name="substitution">&lt;img src='/mail/static/src/img/smiley/angry.png' alt='😈'/&gt;</field>
+ <field name="unicode_source">😠</field>
+ <field name="substitution">&lt;img src='/mail/static/src/img/smiley/angry.png' alt='😠'/&gt;</field>
<field name="description">Angry</field>
<field name="shortcode_type">image</field>
</record>