Skip to content

S
syncEnrollments
Commit 5b1e511a authored by Taylor Otwell's avatar Taylor Otwell
Browse files
Options

Merge branch 'master' into develop

parents e52be1f9 55053de6
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
composer.json
View file @ 5b1e511a
...@@ -3,6 +3,7 @@ ...@@ -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.*"
}, },
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment