aboutsummaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-05-04 10:12:05 +0200
committerMario Vavti <mario@mariovavti.com>2017-05-04 10:12:05 +0200
commita92b9b7adb2be489106138b6269a5f7fe8eea5aa (patch)
treeabab4112741f5d28720185fe0308552de23f5e48 /composer.json
parent263cfe2538a3e1a4e866c80b44ada158475cc792 (diff)
parentbc776a9534b57231b83f4c65fefdc3637db0e024 (diff)
downloadvolse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.tar.gz
volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.tar.bz2
volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json2
1 files changed, 1 insertions, 1 deletions
diff --git a/composer.json b/composer.json
index 9ae0d2150..44606ff2b 100644
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,7 @@
"pixel418/markdownify": "^2.2",
"bshaffer/oauth2-server-php": "^1.9",
"ezyang/htmlpurifier": "^4.9",
- "simplepie/simplepie": ">=1.4.4 || dev-master"
+ "simplepie/simplepie": "~1.5"
},
"require-dev" : {
"php" : ">=7.0",