Merge branch 'pr/276'

Conflicts:
	README.md
This commit is contained in:
Jamie York 2015-08-10 17:31:55 +01:00
commit 9db2b7a0bf

View File

@ -132,6 +132,9 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
* [Slim](http://www.slimframework.com/) - Another simple micro framework.
* [Bullet PHP](http://bulletphp.com/) - A micro framework for building REST APIs.
* [Lumen](http://lumen.laravel.com) - A micro-framework by Laravel.
* [Fast Route](https://github.com/nikic/FastRoute) - A fast routing library.
* [Pux](https://github.com/c9s/Pux) - Another fast routing library.
* [Proton](https://github.com/alexbilbie/Proton) - A StackPHP compatible micro framework
## Micro Framework Extras
*Extras related to micro frameworks and routers.*