summaryrefslogtreecommitdiffstats
path: root/api
diff options
context:
space:
mode:
author=Corey Hulen <corey@hulen.com>2016-01-14 09:00:33 -0600
committer=Corey Hulen <corey@hulen.com>2016-01-14 09:00:33 -0600
commit96b08d45741b443e0e1055ec4737974138d8b50f (patch)
tree7ed2156d65b13d6b9b97968c8ffb5d2a12b428d0 /api
parente37db347f961745638a435e69cba4078b745187c (diff)
parenta341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff)
downloadchat-96b08d45741b443e0e1055ec4737974138d8b50f.tar.gz
chat-96b08d45741b443e0e1055ec4737974138d8b50f.tar.bz2
chat-96b08d45741b443e0e1055ec4737974138d8b50f.zip
Merge branch 'master' into fix-droid
Diffstat (limited to 'api')
-rw-r--r--api/license.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/api/license.go b/api/license.go
index 06bde2b6c..5b3809651 100644
--- a/api/license.go
+++ b/api/license.go
@@ -5,7 +5,7 @@ package api
import (
"bytes"
- l4g "code.google.com/p/log4go"
+ l4g "github.com/alecthomas/log4go"
"github.com/gorilla/mux"
"github.com/mattermost/platform/model"
"github.com/mattermost/platform/utils"