aboutsummaryrefslogtreecommitdiffstats
path: root/composer.lock
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 /composer.lock
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 'composer.lock')
-rw-r--r--composer.lock26
1 files changed, 16 insertions, 10 deletions
diff --git a/composer.lock b/composer.lock
index cd4209f1d..82c381d28 100644
--- a/composer.lock
+++ b/composer.lock
@@ -8,16 +8,16 @@
"packages": [
{
"name": "blueimp/jquery-file-upload",
- "version": "v10.21.0",
+ "version": "v10.30.1",
"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": ""
},
"type": "library",
@@ -65,7 +65,7 @@
"type": "github"
}
],
- "time": "2020-05-06T06:34:07+00:00"
+ "time": "2020-06-10T06:45:27+00:00"
},
{
"name": "bshaffer/oauth2-server-php",
@@ -1228,16 +1228,16 @@
},
{
"name": "twbs/bootstrap",
- "version": "v4.4.1",
+ "version": "v4.5.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": {
@@ -1275,7 +1275,13 @@
"sass",
"web"
],
- "time": "2019-11-28T12:59:49+00:00"
+ "funding": [
+ {
+ "url": "https://opencollective.com/bootstrap",
+ "type": "open_collective"
+ }
+ ],
+ "time": "2020-05-12T17:44:42+00:00"
}
],
"packages-dev": [