diff options
| author | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
|---|---|---|
| committer | =Corey Hulen <corey@hulen.com> | 2016-01-14 09:08:13 -0600 |
| commit | 6d6cada0970a2b341f36dac9b0fed8262ada1865 (patch) | |
| tree | fc3728f15deaebd0c870838a63735659a33456e7 /mattermost.go | |
| parent | 0b986ed3147c885af6b2f33e1ff3eb6754e8f274 (diff) | |
| parent | a341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff) | |
| download | chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.gz chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.tar.bz2 chat-6d6cada0970a2b341f36dac9b0fed8262ada1865.zip | |
Merge branch 'master' into PLT-1429
Diffstat (limited to 'mattermost.go')
| -rw-r--r-- | mattermost.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mattermost.go b/mattermost.go index 3d8ab736f..d96a24313 100644 --- a/mattermost.go +++ b/mattermost.go @@ -17,7 +17,7 @@ import ( "syscall" "time" - l4g "code.google.com/p/log4go" + l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/api" "github.com/mattermost/platform/manualtesting" "github.com/mattermost/platform/model" @@ -31,8 +31,6 @@ import ( _ "github.com/go-ldap/ldap" ) -//ENTERPRISE_IMPORTS - var flagCmdCreateTeam bool var flagCmdCreateUser bool var flagCmdAssignRole bool @@ -67,6 +65,8 @@ func main() { api.InitApi() web.InitWeb() + utils.LoadLicense() + if flagRunCmds { runCmds() } else { |