Merge remote-tracking branch 'origin/master' into ev/client

mckellyln · Sep 10, 2016 · a447cfa · a447cfa
2 parents 53ec301 + 9989f61
commit a447cfa
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 6 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/vendor/github.com/gravitational/configure/cstrings/user.go b/vendor/github.com/gravitational/configure/cstrings/user.go