aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/sabre/vobject/composer.json
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-03-23 21:44:55 -0700
committerzotlabs <mike@macgirvin.com>2018-03-23 21:44:55 -0700
commita8d81a68d62e982094110a340341756fbb6df4a9 (patch)
tree51f310e1b99b5a8e87d8c349b44f73ea7c3ba6e0 /vendor/sabre/vobject/composer.json
parentabe6ab477531916158c04e3d387cb02e839d28b6 (diff)
parent09567da292e4ff1eb89a781b685b26b2f9ba82b4 (diff)
downloadvolse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.gz
volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.tar.bz2
volse-hubzilla-a8d81a68d62e982094110a340341756fbb6df4a9.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'vendor/sabre/vobject/composer.json')
-rw-r--r--vendor/sabre/vobject/composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/vendor/sabre/vobject/composer.json b/vendor/sabre/vobject/composer.json
index 1f22f6de1..2407cabb1 100644
--- a/vendor/sabre/vobject/composer.json
+++ b/vendor/sabre/vobject/composer.json
@@ -37,7 +37,7 @@
"sabre/xml" : ">=1.5 <3.0"
},
"require-dev" : {
- "phpunit/phpunit" : "> 4.8, <6.0.0",
+ "phpunit/phpunit" : "> 4.8.35, <6.0.0",
"sabre/cs" : "^1.0.0"
},