Annajwaszahro
/
MIF_E31222691
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into develop

This commit is contained in:
Taylor Otwell 2013-05-31 08:29:42 -05:00
parent 164e2d9651 d1520dc1b9
commit 5e24837f43
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
composer.json
View File

@ -1,4 +1,7 @@
{ {
"name": "laravel/framework",
"description": "The Laravel Framework.",
"keywords": ["framework", "laravel"],
"require": { "require": {
"laravel/framework": "4.1.*" "laravel/framework": "4.1.*"
}, },

2
public/index.php
View File

@ -26,7 +26,7 @@
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| We need to illuminate PHP development, so let's turn on the lights. | We need to illuminate PHP development, so let's turn on the lights.
| This bootstrap the framework and gets it ready for use, then it | This bootstraps the framework and gets it ready for use, then it
| will load up this application so that we can run it and send | will load up this application so that we can run it and send
| the responses back to the browser and delight these users. | the responses back to the browser and delight these users.
| |