Skip to content

Commit

Permalink
Merge branch 'develop' into 2.2.0
Browse files Browse the repository at this point in the history
  • Loading branch information
PawnKaiser committed Feb 3, 2016
2 parents 94cb907 + cebde52 commit c55c1c7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -15,7 +15,7 @@
],
"require": {
"php": ">=5.5",
"symfony/framework-bundle": "~2.3",
"symfony/framework-bundle": ">=2.3",
"aws/aws-sdk-php": "*"
},
"autoload": {
Expand Down

0 comments on commit c55c1c7

Please sign in to comment.