diff options
| author | zotlabs <mike@macgirvin.com> | 2017-04-17 16:04:17 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-04-17 16:04:17 -0700 |
| commit | 7a31c039fb1114e251a85c4888a305966945167b (patch) | |
| tree | c1f1074e25d0f53bce797c5887f2c235b681694c /composer.json | |
| parent | 60d4b4c4f6ed9f41bdf2e8ec17e448f39f699096 (diff) | |
| parent | 7cca2b7fb0fe716f669b854606fdd1329ccb77ad (diff) | |
| download | volse-hubzilla-7a31c039fb1114e251a85c4888a305966945167b.tar.gz volse-hubzilla-7a31c039fb1114e251a85c4888a305966945167b.tar.bz2 volse-hubzilla-7a31c039fb1114e251a85c4888a305966945167b.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into xdev_merge
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/composer.json b/composer.json index 09e6d783e..9ae0d2150 100644 --- a/composer.json +++ b/composer.json @@ -32,7 +32,8 @@ "michelf/php-markdown" : "^1.7", "pixel418/markdownify": "^2.2", "bshaffer/oauth2-server-php": "^1.9", - "ezyang/htmlpurifier": "^4.9" + "ezyang/htmlpurifier": "^4.9", + "simplepie/simplepie": ">=1.4.4 || dev-master" }, "require-dev" : { "php" : ">=7.0", @@ -56,5 +57,9 @@ "minimum-stability" : "stable", "config" : { "notify-on-install" : false - } + }, + "repositories": [{ + "type": "vcs", + "url": "https://github.com/simplepie/simplepie" + }] } |