diff options
author | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:39:43 -0800 |
---|---|---|
committer | =Corey Hulen <corey@hulen.com> | 2015-07-29 01:39:43 -0800 |
commit | 4244990bf118c04d4d66dd946aaf5217fc59a393 (patch) | |
tree | 9cfad1eec8a462577e1723c62b70520994c0920a /Godeps/Godeps.json | |
parent | 9677a9f71777d75f3def0b0cb238050a30ec6a67 (diff) | |
parent | d222f6c7a3c69a68879cc0fd5aeb7343d72dfb39 (diff) | |
download | chat-4244990bf118c04d4d66dd946aaf5217fc59a393.tar.gz chat-4244990bf118c04d4d66dd946aaf5217fc59a393.tar.bz2 chat-4244990bf118c04d4d66dd946aaf5217fc59a393.zip |
Merge branch 'master' into mm-1355
Diffstat (limited to 'Godeps/Godeps.json')
-rw-r--r-- | Godeps/Godeps.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json index 38f2bb09a..c2b32df06 100644 --- a/Godeps/Godeps.json +++ b/Godeps/Godeps.json @@ -80,7 +80,7 @@ }, { "ImportPath": "github.com/nfnt/resize", - "Rev": "f2d1b73023c55bdfb4fa2ed385d2bec95bce3692" + "Rev": "dc93e1b98c579d90ee2fa15c1fd6dac34f6e7899" }, { "ImportPath": "github.com/stretchr/objx", |