diff options
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 |
commit | 96b08d45741b443e0e1055ec4737974138d8b50f (patch) | |
tree | 7ed2156d65b13d6b9b97968c8ffb5d2a12b428d0 | |
parent | e37db347f961745638a435e69cba4078b745187c (diff) | |
parent | a341dbad2b8a4564b6f270c79f2f9932e499ac80 (diff) | |
download | chat-96b08d45741b443e0e1055ec4737974138d8b50f.tar.gz chat-96b08d45741b443e0e1055ec4737974138d8b50f.tar.bz2 chat-96b08d45741b443e0e1055ec4737974138d8b50f.zip |
Merge branch 'master' into fix-droid
-rw-r--r-- | api/license.go | 2 | ||||
-rw-r--r-- | utils/license.go | 2 |
2 files changed, 2 insertions, 2 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" diff --git a/utils/license.go b/utils/license.go index 84d5bae02..7594e33af 100644 --- a/utils/license.go +++ b/utils/license.go @@ -17,7 +17,7 @@ import ( "strconv" "strings" - l4g "code.google.com/p/log4go" + l4g "github.com/alecthomas/log4go" "github.com/mattermost/platform/model" ) |