diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-30 18:18:28 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-30 18:18:28 -0700 |
| commit | d3cad5a651d32557d92457b347c0d67372d2482c (patch) | |
| tree | 733ade8a68e6d39769468b1caaaa4a7282d9e6a5 /composer.json | |
| parent | 893ae17b99d1a1a720a58879e8075fc9bb1de087 (diff) | |
| parent | 14229d0dd3205ea1e85d2c26d6c79bd68d19eda3 (diff) | |
| download | volse-hubzilla-d3cad5a651d32557d92457b347c0d67372d2482c.tar.gz volse-hubzilla-d3cad5a651d32557d92457b347c0d67372d2482c.tar.bz2 volse-hubzilla-d3cad5a651d32557d92457b347c0d67372d2482c.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json index 9738b21e8..eb584f6eb 100644 --- a/composer.json +++ b/composer.json @@ -37,7 +37,7 @@ }, "require-dev" : { "php" : ">=7.0", - "phpunit/phpunit" : "^6.0", + "phpunit/phpunit" : "^6.1", "behat/behat" : "@stable", "behat/mink-extension": "@stable", "behat/mink-goutte-driver": "@stable", |