Merge branch 'release-4.0'

2017-07-18 15:45:23 -07:00
--- a/model/config.go
+++ b/model/config.go
@@ -1039,7 +1039,7 @@ func (o *Config) SetDefaults() {

 	if o.ServiceSettings.EnableEmojiPicker == nil {
 		o.ServiceSettings.EnableEmojiPicker = new(bool)
-		*o.ServiceSettings.EnableEmojiPicker = false
+		*o.ServiceSettings.EnableEmojiPicker = true
 	}

 	if o.ServiceSettings.RestrictCustomEmojiCreation == nil {