Skip to content

Commit

Permalink
Merge pull request #23 from Lakion/resource-version-bump
Browse files Browse the repository at this point in the history
Composer update
  • Loading branch information
michalmarcinkowski committed Dec 23, 2015
2 parents 0c0d009 + 7482639 commit 500b2b5
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,7 @@
"require": {
"php": ">=5.5",

"sylius/resource-bundle": "0.15.*@dev",
"sylius/resource": "0.15.*@dev",
"sylius/resource-bundle": "0.15",
"incenteev/composer-parameter-handler": "~2.0",
"sensio/distribution-bundle": "2.3.*",
"friendsofsymfony/rest-bundle": "1.5.*@dev",
Expand Down
6 changes: 2 additions & 4 deletions composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 500b2b5

Please sign in to comment.