Merge branch 'master' into develop

Conflicts:
	README.md
	gin.go
	routergroup.go
This commit is contained in:
Manu Mtz-Almeida
2015-08-16 18:38:13 +02:00
27 changed files with 791 additions and 246 deletions
+2 -2
View File
@@ -248,8 +248,8 @@ func TestMiddlewareWrite(t *testing.T) {
assert.Equal(t, w.Body.String(), `hola
<map><foo>bar</foo></map>{"foo":"bar"}
{"foo":"bar"}
event: test
data: message
event:test
data:message
`)
}