summaryrefslogtreecommitdiffstats
path: root/model/config.go
diff options
context:
space:
mode:
authorJoramWilander <jwawilander@gmail.com>2018-07-10 15:01:43 -0400
committerJoramWilander <jwawilander@gmail.com>2018-07-10 15:01:43 -0400
commit6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005 (patch)
tree5564a47257bf6e85aaef711980c5b0fcb4d07dcc /model/config.go
parentc042ffa460296587579aff54b157a5109e022f7e (diff)
parent1e1a5e5e85240f25c4faddcb24c5a29a915fe6e4 (diff)
downloadchat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.tar.gz
chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.tar.bz2
chat-6c7dc2d29ccac5f9925402f6be1a4c2a3c46c005.zip
Merge branch 'plugins-2'
Diffstat (limited to 'model/config.go')
-rw-r--r--model/config.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/model/config.go b/model/config.go
index 1388f896f..7c9643b75 100644
--- a/model/config.go
+++ b/model/config.go
@@ -1727,7 +1727,7 @@ type PluginSettings struct {
EnableUploads *bool
Directory *string
ClientDirectory *string
- Plugins map[string]interface{}
+ Plugins map[string]map[string]interface{}
PluginStates map[string]*PluginState
}
@@ -1757,7 +1757,7 @@ func (s *PluginSettings) SetDefaults() {
}
if s.Plugins == nil {
- s.Plugins = make(map[string]interface{})
+ s.Plugins = make(map[string]map[string]interface{})
}
if s.PluginStates == nil {