Skip to content

Commit

Permalink
Merge pull request Zizaco#78 from Itrulia/master
Browse files Browse the repository at this point in the history
Laravel 4.1 update
  • Loading branch information
Zizaco committed Dec 17, 2013
2 parents 8743a9f + 656db9e commit 277f4df
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions composer.json
Expand Up @@ -15,11 +15,11 @@
],
"require": {
"php": ">=5.4.0",
"illuminate/support": "4.0.x",
"illuminate/support": "4.x",
"laravelbook/ardent": "2.1.x"
},
"require-dev": {
"illuminate/database": "4.0.x",
"illuminate/database": "4.x",
"mockery/mockery": "0.7.2",
"zizaco/factory-muff": "dev-master"
},
Expand Down

0 comments on commit 277f4df

Please sign in to comment.