Merged conflicts for Aura v2 Components.

This commit is contained in:
Phil Sturgeon
2014-12-08 16:44:05 -05:00

View File

@@ -37,7 +37,7 @@ components best decoupled from the Laravel framework are listed above._
[PEAR]: /#pear
[Dependency Management]: /#dependency_management
[FuelPHP Validation package]: https://github.com/fuelphp/validation
[Aura]: http://auraphp.github.com/
[Aura]: http://auraphp.com/packages/v2
[FuelPHP]: https://github.com/fuelphp
[Hoa Project]: https://github.com/hoaproject
[Orno]: https://github.com/orno
@@ -45,4 +45,4 @@ components best decoupled from the Laravel framework are listed above._
[The League of Extraordinary Packages]: http://thephpleague.com/
[Eloquent ORM]: https://github.com/illuminate/database
[Queue]: https://github.com/illuminate/queue
[Illuminate components]: https://github.com/illuminate
[Illuminate components]: https://github.com/illuminate