Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Merge branch '2.2'
  • Loading branch information
Marek Nocon committed Sep 25, 2018
2 parents ffa062d + 70da216 commit 50878da
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions composer.json
Expand Up @@ -72,12 +72,12 @@
"behat/mink-extension": "^2.3.1",
"behat/mink-goutte-driver": "^1.2.1",
"behat/mink-selenium2-driver": "^1.3.1",
"bex/behat-screenshot": "^1.2",
"ezsystems/behatbundle": "^6.5.3",
"ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0",
"phpunit/phpunit": "^6.4.4",
"sensio/generator-bundle": "^3.1.7",
"symfony/phpunit-bridge": "^3.4.11",
"ezsystems/behat-screenshot-image-driver-cloudinary": "^1.0",
"bex/behat-screenshot": "^1.2"
"symfony/phpunit-bridge": "^3.4.11"
},
"conflict": {
"symfony/symfony": "3.4.9||3.4.12",
Expand Down

0 comments on commit 50878da

Please sign in to comment.