diff options
| author | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2017-07-18 15:45:23 -0700 |
| commit | 97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80 (patch) | |
| tree | ec2d68077dd2b12de3173871622f3ec2a2b61d35 /model/config.go | |
| parent | 21a3219b9b1df033635631afa751742bd4c56ea0 (diff) | |
| parent | a350f4dc0754e1aeabb64bd712ce05f7c59cfa60 (diff) | |
| download | chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.gz chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.tar.bz2 chat-97f34e483b0fa8b2a8cfe75b72168cfa38cc9d80.zip | |
Merge branch 'release-4.0'
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/model/config.go b/model/config.go index 7bf891462..5add720d3 100644 --- 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 { |