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.lock | |
| 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.lock')
| -rw-r--r-- | composer.lock | 29 |
1 files changed, 14 insertions, 15 deletions
diff --git a/composer.lock b/composer.lock index bfab14cd5..0dab197f9 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "62261cde663585403a8dd8fda5b85a95", + "content-hash": "21511c39f481ecdc20210f885d840787", "packages": [ { "name": "bshaffer/oauth2-server-php", @@ -265,16 +265,16 @@ }, { "name": "sabre/dav", - "version": "3.2.0", + "version": "3.2.2", "source": { "type": "git", "url": "https://github.com/fruux/sabre-dav.git", - "reference": "5b9737cc2f0182e368d14c80df7f6b2d77dc1457" + "reference": "e987775e619728f12205606c9cc3ee565ffb1516" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/5b9737cc2f0182e368d14c80df7f6b2d77dc1457", - "reference": "5b9737cc2f0182e368d14c80df7f6b2d77dc1457", + "url": "https://api.github.com/repos/fruux/sabre-dav/zipball/e987775e619728f12205606c9cc3ee565ffb1516", + "reference": "e987775e619728f12205606c9cc3ee565ffb1516", "shasum": "" }, "require": { @@ -298,8 +298,8 @@ "require-dev": { "evert/phpdoc-md": "~0.1.0", "monolog/monolog": "^1.18", - "phpunit/phpunit": "> 4.8, <=6.0.0", - "sabre/cs": "~0.0.5" + "phpunit/phpunit": "> 4.8, <6.0.0", + "sabre/cs": "^1.0.0" }, "suggest": { "ext-curl": "*", @@ -344,7 +344,7 @@ "framework", "iCalendar" ], - "time": "2016-06-28T02:44:05+00:00" + "time": "2017-02-15T03:06:08+00:00" }, { "name": "sabre/event", @@ -671,16 +671,16 @@ }, { "name": "simplepie/simplepie", - "version": "dev-master", + "version": "1.5", "source": { "type": "git", "url": "https://github.com/simplepie/simplepie.git", - "reference": "59e7204610d3a8989822eba1c0cbf1d1680bd10d" + "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/simplepie/simplepie/zipball/59e7204610d3a8989822eba1c0cbf1d1680bd10d", - "reference": "59e7204610d3a8989822eba1c0cbf1d1680bd10d", + "url": "https://api.github.com/repos/simplepie/simplepie/zipball/5de5551953f95feef12cf355a7a26a70f94aa3ab", + "reference": "5de5551953f95feef12cf355a7a26a70f94aa3ab", "shasum": "" }, "require": { @@ -727,10 +727,10 @@ "rss" ], "support": { - "source": "https://github.com/simplepie/simplepie/tree/master", + "source": "https://github.com/simplepie/simplepie/tree/1.5", "issues": "https://github.com/simplepie/simplepie/issues" }, - "time": "2017-04-06 03:36:48" + "time": "2017-04-17T07:29:31+00:00" } ], "packages-dev": [ @@ -3675,7 +3675,6 @@ "aliases": [], "minimum-stability": "stable", "stability-flags": { - "simplepie/simplepie": 20, "behat/behat": 0, "behat/mink-extension": 0, "behat/mink-goutte-driver": 0 |