aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/composer
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2017-05-04 10:12:05 +0200
committerMario Vavti <mario@mariovavti.com>2017-05-04 10:12:05 +0200
commita92b9b7adb2be489106138b6269a5f7fe8eea5aa (patch)
treeabab4112741f5d28720185fe0308552de23f5e48 /vendor/composer
parent263cfe2538a3e1a4e866c80b44ada158475cc792 (diff)
parentbc776a9534b57231b83f4c65fefdc3637db0e024 (diff)
downloadvolse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.tar.gz
volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.tar.bz2
volse-hubzilla-a92b9b7adb2be489106138b6269a5f7fe8eea5aa.zip
Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev
Diffstat (limited to 'vendor/composer')
-rw-r--r--vendor/composer/autoload_classmap.php1
-rw-r--r--vendor/composer/autoload_static.php1
-rw-r--r--vendor/composer/installed.json14
3 files changed, 9 insertions, 7 deletions
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index cc1cd6bca..5899fb9ed 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -840,6 +840,7 @@ return array(
'Zotlabs\\Module\\Oembed' => $baseDir . '/Zotlabs/Module/Oembed.php',
'Zotlabs\\Module\\Oep' => $baseDir . '/Zotlabs/Module/Oep.php',
'Zotlabs\\Module\\Oexchange' => $baseDir . '/Zotlabs/Module/Oexchange.php',
+ 'Zotlabs\\Module\\Ofeed' => $baseDir . '/Zotlabs/Module/Ofeed.php',
'Zotlabs\\Module\\Online' => $baseDir . '/Zotlabs/Module/Online.php',
'Zotlabs\\Module\\Page' => $baseDir . '/Zotlabs/Module/Page.php',
'Zotlabs\\Module\\Pconfig' => $baseDir . '/Zotlabs/Module/Pconfig.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 6c000a27b..53b9b20c3 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -977,6 +977,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Module\\Oembed' => __DIR__ . '/../..' . '/Zotlabs/Module/Oembed.php',
'Zotlabs\\Module\\Oep' => __DIR__ . '/../..' . '/Zotlabs/Module/Oep.php',
'Zotlabs\\Module\\Oexchange' => __DIR__ . '/../..' . '/Zotlabs/Module/Oexchange.php',
+ 'Zotlabs\\Module\\Ofeed' => __DIR__ . '/../..' . '/Zotlabs/Module/Ofeed.php',
'Zotlabs\\Module\\Online' => __DIR__ . '/../..' . '/Zotlabs/Module/Online.php',
'Zotlabs\\Module\\Page' => __DIR__ . '/../..' . '/Zotlabs/Module/Page.php',
'Zotlabs\\Module\\Pconfig' => __DIR__ . '/../..' . '/Zotlabs/Module/Pconfig.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 2cb89e187..7e4f0bb29 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -686,17 +686,17 @@
},
{
"name": "simplepie/simplepie",
- "version": "dev-master",
- "version_normalized": "9999999-dev",
+ "version": "1.5",
+ "version_normalized": "1.5.0.0",
"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": {
@@ -708,7 +708,7 @@
"suggest": {
"mf2/mf2": "Microformat module that allows for parsing HTML for microformats"
},
- "time": "2017-04-06T03:36:48+00:00",
+ "time": "2017-04-17T07:29:31+00:00",
"type": "library",
"installation-source": "source",
"autoload": {
@@ -745,7 +745,7 @@
"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"
}
}