Skip to content

Commit

Permalink
Merge branch 'master' into v0.9
Browse files Browse the repository at this point in the history
  • Loading branch information
Simonas Šerlinskas committed Jun 3, 2015
2 parents ea75c83 + 7b32c1e commit 6f3f014
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 @@ -12,7 +12,7 @@
],
"require": {
"php": ">=5.4",
"symfony/symfony": "~2.3",
"symfony/symfony": "~2.3,<2.7",
"elasticsearch/elasticsearch": "~1.0",
"doctrine/annotations": "~1.2"
},
Expand Down

0 comments on commit 6f3f014

Please sign in to comment.