Skip to content

Commit

Permalink
Merge remote-tracking branch 'remotes/dev/4.2' into 4.2
Browse files Browse the repository at this point in the history
  • Loading branch information
CI bot committed Jul 7, 2021
2 parents c8fbfe1 + 302eec4 commit 79be56e
Show file tree
Hide file tree
Showing 2 changed files with 45 additions and 45 deletions.
42 changes: 21 additions & 21 deletions dev.lock
Original file line number Diff line number Diff line change
Expand Up @@ -5751,16 +5751,16 @@
},
{
"name": "nette/php-generator",
"version": "v3.5.3",
"version": "v3.5.4",
"source": {
"type": "git",
"url": "https:/nette/php-generator.git",
"reference": "119f01a7bd590469cb01b538f20a125a28853626"
"reference": "59bb35ed6e8da95854fbf7b7d47dce6156b42915"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nette/php-generator/zipball/119f01a7bd590469cb01b538f20a125a28853626",
"reference": "119f01a7bd590469cb01b538f20a125a28853626",
"url": "https://api.github.com/repos/nette/php-generator/zipball/59bb35ed6e8da95854fbf7b7d47dce6156b42915",
"reference": "59bb35ed6e8da95854fbf7b7d47dce6156b42915",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -5803,7 +5803,7 @@
"homepage": "https://nette.org/contributors"
}
],
"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 7.4 features.",
"description": "🐘 Nette PHP Generator: generates neat PHP code for you. Supports new PHP 8.0 features.",
"homepage": "https://nette.org",
"keywords": [
"code",
Expand All @@ -5813,9 +5813,9 @@
],
"support": {
"issues": "https:/nette/php-generator/issues",
"source": "https:/nette/php-generator/tree/v3.5.3"
"source": "https:/nette/php-generator/tree/v3.5.4"
},
"time": "2021-02-24T18:40:21+00:00"
"time": "2021-07-05T12:02:42+00:00"
},
{
"name": "nette/utils",
Expand Down Expand Up @@ -6475,12 +6475,12 @@
"dist": {
"type": "path",
"url": "../../package/microsoft-sync",
"reference": "6e38cb59760c8f59e58c76beda8ef3d29cb9d46c"
"reference": "5316d6ee9d8a21ce12e4940a9c0c5577e41ad26b"
},
"require": {
"microsoft/microsoft-graph": "^1.33",
"oro/calendar-bundle": "4.2.*",
"oro/platform": "4.2.*"
"oro/platform": "~4.2.5"
},
"type": "symfony-bundle",
"extra": {
Expand Down Expand Up @@ -6990,16 +6990,16 @@
},
{
"name": "php-http/client-common",
"version": "2.3.0",
"version": "2.4.0",
"source": {
"type": "git",
"url": "https:/php-http/client-common.git",
"reference": "e37e46c610c87519753135fb893111798c69076a"
"reference": "29e0c60d982f04017069483e832b92074d0a90b2"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/client-common/zipball/e37e46c610c87519753135fb893111798c69076a",
"reference": "e37e46c610c87519753135fb893111798c69076a",
"url": "https://api.github.com/repos/php-http/client-common/zipball/29e0c60d982f04017069483e832b92074d0a90b2",
"reference": "29e0c60d982f04017069483e832b92074d0a90b2",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -7059,9 +7059,9 @@
],
"support": {
"issues": "https:/php-http/client-common/issues",
"source": "https:/php-http/client-common/tree/2.3.0"
"source": "https:/php-http/client-common/tree/2.4.0"
},
"time": "2020-07-21T10:04:13+00:00"
"time": "2021-07-05T08:19:25+00:00"
},
{
"name": "php-http/discovery",
Expand Down Expand Up @@ -15357,16 +15357,16 @@
},
{
"name": "nikic/php-parser",
"version": "v4.10.5",
"version": "v4.11.0",
"source": {
"type": "git",
"url": "https:/nikic/PHP-Parser.git",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f"
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/4432ba399e47c66624bc73c8c0f811e5c109576f",
"reference": "4432ba399e47c66624bc73c8c0f811e5c109576f",
"url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/fe14cf3672a149364fb66dfe11bf6549af899f94",
"reference": "fe14cf3672a149364fb66dfe11bf6549af899f94",
"shasum": ""
},
"require": {
Expand Down Expand Up @@ -15407,9 +15407,9 @@
],
"support": {
"issues": "https:/nikic/PHP-Parser/issues",
"source": "https:/nikic/PHP-Parser/tree/v4.10.5"
"source": "https:/nikic/PHP-Parser/tree/v4.11.0"
},
"time": "2021-05-03T19:11:20+00:00"
"time": "2021-07-03T13:36:55+00:00"
},
{
"name": "oro/crm-documentation-examples",
Expand Down
48 changes: 24 additions & 24 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 comments on commit 79be56e

Please sign in to comment.