Skip to content

Commit

Permalink
Merge branch 'master' into dependabot/composer/phpunit/phpunit-tw-6.5…
Browse files Browse the repository at this point in the history
…|tw-7.0
  • Loading branch information
xZero707 committed Mar 15, 2018
2 parents c5986ec + 42ce032 commit 2c99bdd
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion composer.json
Expand Up @@ -20,7 +20,7 @@
"require-dev": {
"jakub-onderka/php-console-highlighter": "^0.3.2",
"jakub-onderka/php-parallel-lint": "^1.0",
"phpunit/php-invoker": "^1.1",
"phpunit/php-invoker": "^1.1|^2.0",
"phpunit/phpunit": "^6.5|^7.0",
"squizlabs/php_codesniffer": "^3.2"
},
Expand Down

0 comments on commit 2c99bdd

Please sign in to comment.