aboutsummaryrefslogtreecommitdiffstats
path: root/vendor/composer
diff options
context:
space:
mode:
authorMario Vavti <mario@mariovavti.com>2020-06-14 15:39:00 +0200
committerMario Vavti <mario@mariovavti.com>2020-06-14 15:39:00 +0200
commit7270da6a28f836f94f6d98557df9532e587c3646 (patch)
tree86bc0a8d3956ae4bff86dcbb96bb3b88b68e5daa /vendor/composer
parent8cd66145bdd8bf0f43c2a1774181c974335fc494 (diff)
parent92ee27349cb62e0a78f25686c3fe64cd8dd4130c (diff)
downloadvolse-hubzilla-7270da6a28f836f94f6d98557df9532e587c3646.tar.gz
volse-hubzilla-7270da6a28f836f94f6d98557df9532e587c3646.tar.bz2
volse-hubzilla-7270da6a28f836f94f6d98557df9532e587c3646.zip
Merge branch 'dev' of https://framagit.org/hubzilla/core 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.json30
3 files changed, 20 insertions, 12 deletions
diff --git a/vendor/composer/autoload_classmap.php b/vendor/composer/autoload_classmap.php
index a0ec32622..e37d9ab50 100644
--- a/vendor/composer/autoload_classmap.php
+++ b/vendor/composer/autoload_classmap.php
@@ -1543,6 +1543,7 @@ return array(
'Zotlabs\\Update\\_1235' => $baseDir . '/Zotlabs/Update/_1235.php',
'Zotlabs\\Update\\_1236' => $baseDir . '/Zotlabs/Update/_1236.php',
'Zotlabs\\Update\\_1237' => $baseDir . '/Zotlabs/Update/_1237.php',
+ 'Zotlabs\\Update\\_1238' => $baseDir . '/Zotlabs/Update/_1238.php',
'Zotlabs\\Web\\Controller' => $baseDir . '/Zotlabs/Web/Controller.php',
'Zotlabs\\Web\\HTTPHeaders' => $baseDir . '/Zotlabs/Web/HTTPHeaders.php',
'Zotlabs\\Web\\HTTPSig' => $baseDir . '/Zotlabs/Web/HTTPSig.php',
diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php
index 3e79682c2..4cb7400c2 100644
--- a/vendor/composer/autoload_static.php
+++ b/vendor/composer/autoload_static.php
@@ -1711,6 +1711,7 @@ class ComposerStaticInit7b34d7e50a62201ec5d5e526a5b8b35d
'Zotlabs\\Update\\_1235' => __DIR__ . '/../..' . '/Zotlabs/Update/_1235.php',
'Zotlabs\\Update\\_1236' => __DIR__ . '/../..' . '/Zotlabs/Update/_1236.php',
'Zotlabs\\Update\\_1237' => __DIR__ . '/../..' . '/Zotlabs/Update/_1237.php',
+ 'Zotlabs\\Update\\_1238' => __DIR__ . '/../..' . '/Zotlabs/Update/_1238.php',
'Zotlabs\\Web\\Controller' => __DIR__ . '/../..' . '/Zotlabs/Web/Controller.php',
'Zotlabs\\Web\\HTTPHeaders' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPHeaders.php',
'Zotlabs\\Web\\HTTPSig' => __DIR__ . '/../..' . '/Zotlabs/Web/HTTPSig.php',
diff --git a/vendor/composer/installed.json b/vendor/composer/installed.json
index 05823b19d..c4332c4b4 100644
--- a/vendor/composer/installed.json
+++ b/vendor/composer/installed.json
@@ -1,20 +1,20 @@
[
{
"name": "blueimp/jquery-file-upload",
- "version": "v10.21.0",
- "version_normalized": "10.21.0.0",
+ "version": "v10.30.1",
+ "version_normalized": "10.30.1.0",
"source": {
"type": "git",
"url": "https://github.com/vkhramtsov/jQuery-File-Upload.git",
- "reference": "74462f4b06e0f3b006d43cb101226f9d0e1219b7"
+ "reference": "fa90144200874f51eefcaeae1e1a05f0611ddf9e"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/74462f4b06e0f3b006d43cb101226f9d0e1219b7",
- "reference": "74462f4b06e0f3b006d43cb101226f9d0e1219b7",
+ "url": "https://api.github.com/repos/vkhramtsov/jQuery-File-Upload/zipball/fa90144200874f51eefcaeae1e1a05f0611ddf9e",
+ "reference": "fa90144200874f51eefcaeae1e1a05f0611ddf9e",
"shasum": ""
},
- "time": "2020-05-06T06:34:07+00:00",
+ "time": "2020-06-10T06:45:27+00:00",
"type": "library",
"installation-source": "dist",
"autoload": {
@@ -1263,23 +1263,23 @@
},
{
"name": "twbs/bootstrap",
- "version": "v4.4.1",
- "version_normalized": "4.4.1.0",
+ "version": "v4.5.0",
+ "version_normalized": "4.5.0.0",
"source": {
"type": "git",
"url": "https://github.com/twbs/bootstrap.git",
- "reference": "dca1ab7d877bc4b664b43604657a2b5fbe2b4ecb"
+ "reference": "7a6da5e3e7ad7c749dde806546a35d4d4259d965"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/twbs/bootstrap/zipball/dca1ab7d877bc4b664b43604657a2b5fbe2b4ecb",
- "reference": "dca1ab7d877bc4b664b43604657a2b5fbe2b4ecb",
+ "url": "https://api.github.com/repos/twbs/bootstrap/zipball/7a6da5e3e7ad7c749dde806546a35d4d4259d965",
+ "reference": "7a6da5e3e7ad7c749dde806546a35d4d4259d965",
"shasum": ""
},
"replace": {
"twitter/bootstrap": "self.version"
},
- "time": "2019-11-28T12:59:49+00:00",
+ "time": "2020-05-12T17:44:42+00:00",
"type": "library",
"extra": {
"branch-alias": {
@@ -1312,6 +1312,12 @@
"responsive",
"sass",
"web"
+ ],
+ "funding": [
+ {
+ "url": "https://opencollective.com/bootstrap",
+ "type": "open_collective"
+ }
]
}
]