Skip to content

Commit

Permalink
Merge branch 'setup'
Browse files Browse the repository at this point in the history
  • Loading branch information
Zizaco committed Sep 14, 2015
2 parents 27045f3 + e7d9279 commit bf3df3f
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
"require": {
"php": ">=5.5.9",
"laravel/framework": "5.1.*",
"laravelcollective/html": "~5.0",
"laravelcollective/html": "~5.0"
},
"require-dev": {
"fzaninotto/faker": "~1.4",
Expand Down

0 comments on commit bf3df3f

Please sign in to comment.