diff options
| author | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2019-05-02 11:33:07 +0200 |
| commit | 47fba5827bd106f53625b543f30643ca5ba1c16e (patch) | |
| tree | bef05781eacc6dbc67d03899e0dde0257ce58096 /vendor/sabre/vobject/composer.json | |
| parent | 47f75ad8bfbe8325a76ae6fe466aa8080fc87045 (diff) | |
| parent | 516167c0f8579c8a068b6e52557e7e1109f897ae (diff) | |
| download | volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.gz volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.tar.bz2 volse-hubzilla-47fba5827bd106f53625b543f30643ca5ba1c16e.zip | |
Merge branch 'dev' into 'dev'
# Conflicts:
# Zotlabs/Lib/ThreadItem.php
Diffstat (limited to 'vendor/sabre/vobject/composer.json')
| -rw-r--r-- | vendor/sabre/vobject/composer.json | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vendor/sabre/vobject/composer.json b/vendor/sabre/vobject/composer.json index 2407cabb1..ad026879e 100644 --- a/vendor/sabre/vobject/composer.json +++ b/vendor/sabre/vobject/composer.json @@ -37,9 +37,7 @@ "sabre/xml" : ">=1.5 <3.0" }, "require-dev" : { - "phpunit/phpunit" : "> 4.8.35, <6.0.0", - "sabre/cs" : "^1.0.0" - + "phpunit/phpunit" : "> 4.8.35, <6.0.0" }, "suggest" : { "hoa/bench" : "If you would like to run the benchmark scripts" |