From 49d7e553521a133ef4e940d6f578a4f0e69e34da Mon Sep 17 00:00:00 2001
From: Kane York <rikingcoding@gmail.com>
Date: Tue, 26 Nov 2013 13:34:44 -0800
Subject: [PATCH] Change :D to map to :smiley: instead of :grin:

Because :grin: looks like somebody is constipated, really
---
 plugins/emoji/assets/javascripts/emoji.js.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/emoji/assets/javascripts/emoji.js.erb b/plugins/emoji/assets/javascripts/emoji.js.erb
index d6e20270e..17fbbabce 100644
--- 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',