Skip to content

Commit

Permalink
Merge branch 'master' of github.com:codegangsta/martini
Browse files Browse the repository at this point in the history
  • Loading branch information
codegangsta committed Dec 4, 2013
2 parents 789c3d8 + 6ecaa1c commit 1102114
Showing 1 changed file with 6 additions and 0 deletions.
6 changes: 6 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -262,6 +262,9 @@ Start by looking in the [martini-contrib](http://github.com/codegangsta/martini-
* [gzip](https://github.com/codegangsta/martini-contrib/tree/master/gzip) - Handler for adding gzip compress to requests
* [render](https://github.com/codegangsta/martini-contrib/tree/master/render) - Handler that provides a service for easily rendering JSON and HTML templates.
* [acceptlang](https://github.com/codegangsta/martini-contrib/tree/master/acceptlang) - Handler for parsing the `Accept-Language` HTTP header.
* [sessions](https://github.com/codegangsta/martini-contrib/tree/master/sessions) - Handler that provides a Session service.
* [web](https://github.com/codegangsta/martini-contrib/tree/master/web) - web.go Context compatibility.
* [strip](https://github.com/codegangsta/martini-contrib/tree/master/strip) - URL Prefix stripping.

### How do I integrate with existing servers?

Expand Down Expand Up @@ -300,4 +303,7 @@ To have more flexibility over port and host, use the `http.ListenAndServe` funct
Martini is meant to be kept tiny and clean. Most contributions should end up in the [martini-contrib](http://github.com/codegangsta/martini-contrib) repository. If you do have a contribution for the core of Martini feel free to put up a Pull Request.

## About

Inspired by [express](https://github.com/visionmedia/express) and [sinatra](https://github.com/sinatra/sinatra)

Martini is obsessively designed by none other than the [Code Gangsta](http://codegangsta.io/)

0 comments on commit 1102114

Please sign in to comment.