diff options
| author | Christopher Speller <crspeller@gmail.com> | 2015-11-26 09:02:00 -0500 |
|---|---|---|
| committer | Christopher Speller <crspeller@gmail.com> | 2015-11-26 09:02:00 -0500 |
| commit | 006fc61ecce1ba3d5c7b7163309467c24edbbc46 (patch) | |
| tree | 533f5dcd094ebd94d425e64a4261b7b21ec6f3fa /model | |
| parent | aaced173f8b3020fbbef236d84b070c2c67ee968 (diff) | |
| parent | 2639452967e66c4840164c36817234d3e7c12ac1 (diff) | |
| download | chat-006fc61ecce1ba3d5c7b7163309467c24edbbc46.tar.gz chat-006fc61ecce1ba3d5c7b7163309467c24edbbc46.tar.bz2 chat-006fc61ecce1ba3d5c7b7163309467c24edbbc46.zip | |
Merge pull request #1505 from mattermost/lib-upgrade
Lib upgrade
Diffstat (limited to 'model')
| -rw-r--r-- | model/user.go | 2 | ||||
| -rw-r--r-- | model/utils.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/model/user.go b/model/user.go index 77dc04a03..4ba35c6c4 100644 --- a/model/user.go +++ b/model/user.go @@ -4,9 +4,9 @@ package model import ( - "code.google.com/p/go.crypto/bcrypt" "encoding/json" "fmt" + "golang.org/x/crypto/bcrypt" "io" "regexp" "strings" diff --git a/model/utils.go b/model/utils.go index ff26bfc66..b49b4bb24 100644 --- a/model/utils.go +++ b/model/utils.go @@ -5,10 +5,10 @@ package model import ( "bytes" - "code.google.com/p/go-uuid/uuid" "encoding/base32" "encoding/json" "fmt" + "github.com/pborman/uuid" "io" "net/mail" "net/url" |