diff options
| author | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
|---|---|---|
| committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-24 08:40:52 -0400 |
| commit | 69304fb54da5300941a49364e4344c2c65e654d6 (patch) | |
| tree | de20c2e8a479ae3d13bcd21abc3dff067afa602e /app/app.go | |
| parent | e46b94fa66c029b9a493fdc6ff7bcb98e9651568 (diff) | |
| parent | 47f3c064db885c2cb2e75c195ea24e2ef687891d (diff) | |
| download | chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.gz chat-69304fb54da5300941a49364e4344c2c65e654d6.tar.bz2 chat-69304fb54da5300941a49364e4344c2c65e654d6.zip | |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'app/app.go')
| -rw-r--r-- | app/app.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/app/app.go b/app/app.go index 16470d850..e5a496c6b 100644 --- a/app/app.go +++ b/app/app.go @@ -39,8 +39,10 @@ type App struct { Log *mlog.Logger - PluginEnv *pluginenv.Environment - PluginConfigListenerId string + PluginEnv *pluginenv.Environment + PluginConfigListenerId string + IsPluginSandboxSupported bool + pluginStatuses map[string]*model.PluginStatus EmailBatching *EmailBatchingJob |