diff options
| author | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2015-09-22 13:18:42 -0700 |
| commit | 6e60768abe6f0caa639febf068d718d62881ce62 (patch) | |
| tree | 0600c72a7a9a3f7c1df167b3f870b38863e9a564 /model/config.go | |
| parent | e22e7b8b7b66f342c2df693bbfc06a85980d253e (diff) | |
| parent | ac7918c5540900ab0dbe43d61b8c1155e4279b55 (diff) | |
| download | chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.gz chat-6e60768abe6f0caa639febf068d718d62881ce62.tar.bz2 chat-6e60768abe6f0caa639febf068d718d62881ce62.zip | |
Fixing merge conflict
Diffstat (limited to 'model/config.go')
| -rw-r--r-- | model/config.go | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/model/config.go b/model/config.go index 7791c4021..76d449904 100644 --- a/model/config.go +++ b/model/config.go @@ -26,6 +26,7 @@ type ServiceSettings struct { GoogleDeveloperKey string EnableOAuthServiceProvider bool EnableTesting bool + EnableIncomingWebhooks bool } type SSOSettings struct { |