From e6cc07fc43079b5f2101ac3f0ed137f35fcac96d Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Mon, 26 Jun 2017 16:38:57 -0400
Subject: [PATCH] FEATURE: twitter is the new default emoji set

---
 config/site_settings.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/site_settings.yml b/config/site_settings.yml
index 7582f442ad..a8acafc33d 100644
--- a/config/site_settings.yml
+++ b/config/site_settings.yml
@@ -568,7 +568,7 @@ posting:
     default: true
     client: true
   emoji_set:
-    default: 'emoji_one'
+    default: 'twitter'
     client: true
     enum: 'EmojiSetSiteSetting'
   enforce_square_emoji: