diff options
| author | Max Kostikov <max@kostikov.co> | 2020-07-19 14:58:19 +0200 |
|---|---|---|
| committer | Max Kostikov <max@kostikov.co> | 2020-07-19 14:58:19 +0200 |
| commit | 5ea7196e78d08550b3ec93d3b708f915b3b0057f (patch) | |
| tree | 07e5f865b6c83898d7ac508302a227509e8207fd /composer.lock | |
| parent | d0c7c99d5e1eb27281431231640c7e8c019b90e1 (diff) | |
| parent | fcc47e69e424635fa54b2684329623d4f7694436 (diff) | |
| download | volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.tar.gz volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.tar.bz2 volse-hubzilla-5ea7196e78d08550b3ec93d3b708f915b3b0057f.zip | |
Merge branch 'dev' into 'dev'
Dev sync
See merge request kostikov/core!1
Diffstat (limited to 'composer.lock')
| -rw-r--r-- | composer.lock | 40 |
1 files changed, 23 insertions, 17 deletions
diff --git a/composer.lock b/composer.lock index cd4209f1d..a80678be8 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", @@ -127,24 +127,24 @@ }, { "name": "commerceguys/intl", - "version": "v1.0.5", + "version": "v1.0.6", "source": { "type": "git", "url": "https://github.com/commerceguys/intl.git", - "reference": "6a8c7a8da189d51856b642a61aeb8ae5114fec6c" + "reference": "47d5d6d60d0cc25f867e337ce229a228bf6be6f8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/commerceguys/intl/zipball/6a8c7a8da189d51856b642a61aeb8ae5114fec6c", - "reference": "6a8c7a8da189d51856b642a61aeb8ae5114fec6c", + "url": "https://api.github.com/repos/commerceguys/intl/zipball/47d5d6d60d0cc25f867e337ce229a228bf6be6f8", + "reference": "47d5d6d60d0cc25f867e337ce229a228bf6be6f8", "shasum": "" }, "require": { - "php": ">=5.5.0" + "php": ">=7.0.8" }, "require-dev": { "mikey179/vfsstream": "1.*", - "phpunit/phpunit": "~4.0" + "phpunit/phpunit": "^6.0" }, "type": "library", "extra": { @@ -167,7 +167,7 @@ } ], "description": "Internationalization library powered by CLDR data.", - "time": "2019-10-22T10:40:46+00:00" + "time": "2020-05-26T12:19:43+00:00" }, { "name": "desandro/imagesloaded", @@ -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": [ |