diff options
| author | zotlabs <mike@macgirvin.com> | 2017-05-04 19:20:29 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-05-04 19:20:29 -0700 |
| commit | e308c3d34afda1c467b049314324faa546294c9a (patch) | |
| tree | 81352041e9dd94700e8be158ddda7ee66fea68f4 /composer.json | |
| parent | 977677d0051db24c6b7666a73c4dd6a48fe89377 (diff) | |
| parent | 5c7acf4807aa427cf1391e0a5d044b453c38e619 (diff) | |
| download | volse-hubzilla-e308c3d34afda1c467b049314324faa546294c9a.tar.gz volse-hubzilla-e308c3d34afda1c467b049314324faa546294c9a.tar.bz2 volse-hubzilla-e308c3d34afda1c467b049314324faa546294c9a.zip | |
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge
Diffstat (limited to 'composer.json')
| -rw-r--r-- | composer.json | 2 |
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", |