Merge branch 'master' into develop
This commit is contained in:
commit
5b1e511ab1
|
@ -3,6 +3,7 @@
|
||||||
"description": "The Laravel Framework.",
|
"description": "The Laravel Framework.",
|
||||||
"keywords": ["framework", "laravel"],
|
"keywords": ["framework", "laravel"],
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"type": "project",
|
||||||
"require": {
|
"require": {
|
||||||
"laravel/framework": "4.3.*"
|
"laravel/framework": "4.3.*"
|
||||||
},
|
},
|
||||||
|
|
Loading…
Reference in New Issue