Merge pull request #1697 from riking/patch-1

Change :D to map to 😃 instead of 😁
2013-11-26 13:42:40 -08:00 · 2013-11-26 13:42:40 -08:00 · 9ba9246c6e
parent 4e310dd75f 49d7e55352
commit 9ba9246c6e
1 changed files with 2 additions and 2 deletions
--- a/plugins/emoji/assets/javascripts/emoji.js.erb
+++ b/plugins/emoji/assets/javascripts/emoji.js.erb
@ -25,8 +25,8 @@
    ':-P'   : 'stuck_out_tongue',
    ':O'   : 'open_mouth',
    ':-O'   : 'open_mouth',
-    ':D'   : 'grin',
-    ':-D'   : 'grin',
+    ':D'   : 'smiley',
+    ':-D'   : 'smiley',
    ':|'   : 'expressionless',
    ':-|'   : 'expressionless',
    ";P"   : 'stuck_out_tongue_winking_eye',