Merge branch 'release-3.7' into master.

2017-03-17 16:29:26 +00:00
--- a/webapp/utils/constants.jsx
+++ b/webapp/utils/constants.jsx
@@ -443,7 +443,7 @@ export const Constants = {
            linkColor: '#2f81b7',
            buttonBg: '#1dacfc',
            buttonColor: '#FFFFFF',
-            mentionHighlightBg: '#fff2bb',
+            mentionHighlightBg: '#f3e197',
            mentionHighlightLink: '#2f81b7',
            codeTheme: 'github',
            image: defaultThemeImage
@@ -468,7 +468,7 @@ export const Constants = {
            linkColor: '#2389d7',
            buttonBg: '#23A2FF',
            buttonColor: '#FFFFFF',
-            mentionHighlightBg: '#fff2bb',
+            mentionHighlightBg: '#f3e197',
            mentionHighlightLink: '#2f81b7',
            codeTheme: 'github',
            image: mattermostThemeImage