Skip to content

Commit

Permalink
Merge branch 'master' into master
Browse files Browse the repository at this point in the history
  • Loading branch information
devster committed Nov 2, 2017
2 parents f0b8ffd + 8039d3f commit f4716da
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion composer.json
Expand Up @@ -18,10 +18,15 @@

"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "2.0.x-dev"
}
},

"require-dev": {
"phpunit/phpunit": "*"
},

"scripts": {
"test": "vendor/bin/phpunit"
}
}

0 comments on commit f4716da

Please sign in to comment.