diff options
author | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2017-08-16 10:32:35 +0200 |
commit | 4a7384bc0ce1893a432bf4b7d67bca23796fe9db (patch) | |
tree | 5623c66a3f66445284529d6207e4ab4a2edb2810 /composer.json | |
parent | c664a4bdcd1bd578f5ec3c2884f7c97e9f68d2d7 (diff) | |
parent | 90bc21f2d560d879d7eaf05a85af6d6dca53ebac (diff) | |
download | volse-hubzilla-2.6.tar.gz volse-hubzilla-2.6.tar.bz2 volse-hubzilla-2.6.zip |
Merge branch '2.6RC'2.6
Diffstat (limited to 'composer.json')
-rw-r--r-- | composer.json | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/composer.json b/composer.json index 44606ff2b..e6bdba61c 100644 --- a/composer.json +++ b/composer.json @@ -30,14 +30,14 @@ "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", - "phpunit/phpunit" : "^6.0", + "phpunit/phpunit" : "^6.1", "behat/behat" : "@stable", "behat/mink-extension": "@stable", "behat/mink-goutte-driver": "@stable", @@ -56,7 +56,8 @@ }, "minimum-stability" : "stable", "config" : { - "notify-on-install" : false + "notify-on-install" : false, + "optimize-autoloader" : true }, "repositories": [{ "type": "vcs", |