Merge remote-tracking branch 'origin/master' into v2

This commit is contained in:
Dan Buch 2016-05-17 03:34:53 -04:00
commit 6b0c4de4aa
No known key found for this signature in database
GPG Key ID: FAEF12936DD3E3EC

View File

@ -34,7 +34,7 @@ export PATH=$PATH:$GOPATH/bin
There is currently a long-lived branch named `v2` that is intended to land as
the new `master` branch once development there has settled down. The current
`master` branch (current mirrored as `v1`) is being manually merged into `v2` on
`master` branch (mirrored as `v1`) is being manually merged into `v2` on
an irregular human-based schedule, but generally if one wants to "upgrade" to
`v2` *now* and accept the volatility (read: "awesomeness") that comes along with
that, please use whatever version pinning of your preference, such as via