浏览代码

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

Conflicts:
	README.md
pull/276/head
Jamie 11 年前
父节点
当前提交
a5d8750eaf
共有 1 个文件被更改,包括 2 次插入1 次删除
  1. 2
    1
      README.md

+ 2
- 1
README.md 查看文件

97
 * [Laravel 4](http://laravel.com/) - Another PHP framework.
97
 * [Laravel 4](http://laravel.com/) - Another PHP framework.
98
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
98
 * [Aura PHP](http://auraphp.com/) - A framework of independent components.
99
 * [Yii2](https://github.com/yiisoft/yii2/) - Another PHP framework.
99
 * [Yii2](https://github.com/yiisoft/yii2/) - Another PHP framework.
100
-* [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
101
 * [Nette](http://nette.org) - Another framework comprised of individual components.
100
 * [Nette](http://nette.org) - Another framework comprised of individual components.
101
+* [PPI Framework 2](http://www.ppi.io) - An interoperability framework.
102
+* [Phalcon](http://phalconphp.com/en/) - A framework implemented as a C extension.
102
 
103
 
103
 ## Framework Extras
104
 ## Framework Extras
104
 *Extras related to web development frameworks.*
105
 *Extras related to web development frameworks.*

正在加载...
取消
保存