From a3872e5f5ea59c78c9a1d8b4fcb77a418c6c25b6 Mon Sep 17 00:00:00 2001
From: Christopher Speller <crspeller@gmail.com>
Date: Mon, 21 Mar 2016 10:20:35 -0400
Subject: Merge release branch commits

---
 webapp/utils/constants.jsx | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

(limited to 'webapp/utils')

diff --git a/webapp/utils/constants.jsx b/webapp/utils/constants.jsx
index a4aa7604c..872bdb8ab 100644
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -428,6 +428,21 @@ export default {
             id: 'mentionHighlightLink',
             uiName: 'Mention Highlight Link'
         },
+        {
+            group: 'linkAndButtonElements',
+            id: 'linkColor',
+            uiName: 'Link Color'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonBg',
+            uiName: 'Button BG'
+        },
+        {
+            group: 'linkAndButtonElements',
+            id: 'buttonColor',
+            uiName: 'Button Text'
+        },
         {
             group: 'centerChannelElements',
             id: 'codeTheme',
@@ -458,21 +473,6 @@ export default {
                     iconURL: monokaiIcon
                 }
             ]
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'linkColor',
-            uiName: 'Link Color'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonBg',
-            uiName: 'Button BG'
-        },
-        {
-            group: 'linkAndButtonElements',
-            id: 'buttonColor',
-            uiName: 'Button Text'
         }
     ],
     DEFAULT_CODE_THEME: 'github',
-- 
cgit v1.2.3-1-g7c22