aboutsummaryrefslogtreecommitdiffstats
path: root/composer.json
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2017-05-23 16:14:41 -0700
committerzotlabs <mike@macgirvin.com>2017-05-23 16:14:41 -0700
commitbf580fcc0651663031d74072ee17a8f6becb49fc (patch)
treeaaf0ac6129053c728f29559381f521395494f0b8 /composer.json
parent357e7af6adb303aa12f6506585e7d59a1250da99 (diff)
parent31d920817264552cece5a57c2390411af4d7a3a1 (diff)
downloadvolse-hubzilla-bf580fcc0651663031d74072ee17a8f6becb49fc.tar.gz
volse-hubzilla-bf580fcc0651663031d74072ee17a8f6becb49fc.tar.bz2
volse-hubzilla-bf580fcc0651663031d74072ee17a8f6becb49fc.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'composer.json')
-rw-r--r--composer.json4
1 files changed, 2 insertions, 2 deletions
diff --git a/composer.json b/composer.json
index 44606ff2b..9738b21e8 100644
--- a/composer.json
+++ b/composer.json
@@ -30,10 +30,10 @@
"ext-openssl" : "*",
"sabre/dav" : "~3.2",
"michelf/php-markdown" : "^1.7",
- "pixel418/markdownify": "^2.2",
"bshaffer/oauth2-server-php": "^1.9",
"ezyang/htmlpurifier": "^4.9",
- "simplepie/simplepie": "~1.5"
+ "simplepie/simplepie": "~1.5",
+ "league/html-to-markdown": "^4.4"
},
"require-dev" : {
"php" : ">=7.0",