Merge branch 'patch-1' of github.com:dragoonis/awesome-php into dragoonis-patch-1

Conflicts:
	README.md
This commit is contained in:
Jamie 2014-12-01 18:06:48 -07:00
commit a5d8750eaf

View File

@ -97,8 +97,9 @@ Please see [CONTRIBUTING](https://github.com/ziadoz/awesome-php/blob/master/CONT
* [Laravel 4](http://laravel.com/) - Another PHP framework. * [Laravel 4](http://laravel.com/) - Another PHP framework.
* [Aura PHP](http://auraphp.com/) - A framework of independent components. * [Aura PHP](http://auraphp.com/) - A framework of independent components.
* [Yii2](https://github.com/yiisoft/yii2/) - Another PHP framework. * [Yii2](https://github.com/yiisoft/yii2/) - Another PHP framework.
* [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
* [Nette](http://nette.org) - Another framework comprised of individual components. * [Nette](http://nette.org) - Another framework comprised of individual components.
* [PPI Framework 2](http://www.ppi.io) - An interoperability framework.
* [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
## Framework Extras ## Framework Extras
*Extras related to web development frameworks.* *Extras related to web development frameworks.*