Merge branch 'develop' of git://github.com/superalsrk/gin into superalsrk-develop

Conflicts:
	Godeps/Godeps.json
This commit is contained in:
Javier Provecho Fernandez 2015-02-07 14:29:37 +01:00
commit 171efe228d
2 changed files with 3 additions and 2 deletions

2
Godeps/Godeps.json generated
View File

@ -4,7 +4,7 @@
"Deps": [
{
"ImportPath": "github.com/julienschmidt/httprouter",
"Rev": "aeec11926f7a8fab580383810e1b1bbba99bdaa7"
"Rev": "00ce1c6a267162792c367acc43b1681a884e1872"
}
]
}

View File

@ -134,7 +134,8 @@ func main() {
c.String(200, message)
})
// However, this one will match /user/john and also /user/john/send
// However, this one will match /user/john/ and also /user/john/send
// If no other routers match /user/john, it will redirect to /user/join/
r.GET("/user/:name/*action", func(c *gin.Context) {
name := c.Params.ByName("name")
action := c.Params.ByName("action")