|
@@ -620,16 +620,16 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "consolidation/annotated-command",
|
|
"name": "consolidation/annotated-command",
|
|
- "version": "4.5.4",
|
|
|
|
|
|
+ "version": "4.5.5",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
"url": "https://github.com/consolidation/annotated-command.git",
|
|
"url": "https://github.com/consolidation/annotated-command.git",
|
|
- "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904"
|
|
|
|
|
|
+ "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd"
|
|
},
|
|
},
|
|
"dist": {
|
|
"dist": {
|
|
"type": "zip",
|
|
"type": "zip",
|
|
- "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904",
|
|
|
|
- "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904",
|
|
|
|
|
|
+ "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/67cea8e8e7656b74da651ea6f49321853996c0fd",
|
|
|
|
+ "reference": "67cea8e8e7656b74da651ea6f49321853996c0fd",
|
|
"shasum": ""
|
|
"shasum": ""
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
@@ -670,9 +670,9 @@
|
|
"description": "Initialize Symfony Console commands from annotated command class methods.",
|
|
"description": "Initialize Symfony Console commands from annotated command class methods.",
|
|
"support": {
|
|
"support": {
|
|
"issues": "https://github.com/consolidation/annotated-command/issues",
|
|
"issues": "https://github.com/consolidation/annotated-command/issues",
|
|
- "source": "https://github.com/consolidation/annotated-command/tree/4.5.4"
|
|
|
|
|
|
+ "source": "https://github.com/consolidation/annotated-command/tree/4.5.5"
|
|
},
|
|
},
|
|
- "time": "2022-04-05T17:58:10+00:00"
|
|
|
|
|
|
+ "time": "2022-04-26T16:18:25+00:00"
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "consolidation/config",
|
|
"name": "consolidation/config",
|
|
@@ -3148,7 +3148,6 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/config_filter",
|
|
"name": "drupal/config_filter",
|
|
-<<<<<<< HEAD
|
|
|
|
"version": "1.9.0",
|
|
"version": "1.9.0",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
@@ -3160,19 +3159,6 @@
|
|
"url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip",
|
|
"url": "https://ftp.drupal.org/files/projects/config_filter-8.x-1.9.zip",
|
|
"reference": "8.x-1.9",
|
|
"reference": "8.x-1.9",
|
|
"shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f"
|
|
"shasum": "cf6919fc5039771f8e6c2ed203f29ab0eca8d91f"
|
|
-=======
|
|
|
|
- "version": "2.3.0",
|
|
|
|
- "source": {
|
|
|
|
- "type": "git",
|
|
|
|
- "url": "https://git.drupalcode.org/project/config_filter.git",
|
|
|
|
- "reference": "8.x-2.3"
|
|
|
|
- },
|
|
|
|
- "dist": {
|
|
|
|
- "type": "zip",
|
|
|
|
- "url": "https://ftp.drupal.org/files/projects/config_filter-8.x-2.3.zip",
|
|
|
|
- "reference": "8.x-2.3",
|
|
|
|
- "shasum": "043fc712997cdd6b384024ab96bebba70e5c6b26"
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
"drupal/core": "^8 || ^9"
|
|
"drupal/core": "^8 || ^9"
|
|
@@ -3183,13 +3169,8 @@
|
|
"type": "drupal-module",
|
|
"type": "drupal-module",
|
|
"extra": {
|
|
"extra": {
|
|
"drupal": {
|
|
"drupal": {
|
|
-<<<<<<< HEAD
|
|
|
|
"version": "8.x-1.9",
|
|
"version": "8.x-1.9",
|
|
"datestamp": "1649336052",
|
|
"datestamp": "1649336052",
|
|
-=======
|
|
|
|
- "version": "8.x-2.3",
|
|
|
|
- "datestamp": "1649336106",
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"security-coverage": {
|
|
"security-coverage": {
|
|
"status": "covered",
|
|
"status": "covered",
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
@@ -3799,18 +3780,6 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/core",
|
|
"name": "drupal/core",
|
|
-<<<<<<< HEAD
|
|
|
|
- "version": "9.3.9",
|
|
|
|
- "source": {
|
|
|
|
- "type": "git",
|
|
|
|
- "url": "https://github.com/drupal/core.git",
|
|
|
|
- "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
|
|
|
|
- },
|
|
|
|
- "dist": {
|
|
|
|
- "type": "zip",
|
|
|
|
- "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
|
|
|
|
- "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
|
|
|
|
-=======
|
|
|
|
"version": "9.3.12",
|
|
"version": "9.3.12",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
@@ -3821,7 +3790,6 @@
|
|
"type": "zip",
|
|
"type": "zip",
|
|
"url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
|
|
"url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
|
|
"reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
|
|
"reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
@@ -4063,15 +4031,6 @@
|
|
],
|
|
],
|
|
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
|
|
"description": "Drupal is an open source content management platform powering millions of websites and applications.",
|
|
"support": {
|
|
"support": {
|
|
-<<<<<<< HEAD
|
|
|
|
- "source": "https://github.com/drupal/core/tree/9.3.9"
|
|
|
|
- },
|
|
|
|
- "time": "2022-03-21T21:21:58+00:00"
|
|
|
|
- },
|
|
|
|
- {
|
|
|
|
- "name": "drupal/core-composer-scaffold",
|
|
|
|
- "version": "9.3.9",
|
|
|
|
-=======
|
|
|
|
"source": "https://github.com/drupal/core/tree/9.3.12"
|
|
"source": "https://github.com/drupal/core/tree/9.3.12"
|
|
},
|
|
},
|
|
"time": "2022-04-20T14:25:27+00:00"
|
|
"time": "2022-04-20T14:25:27+00:00"
|
|
@@ -4079,7 +4038,6 @@
|
|
{
|
|
{
|
|
"name": "drupal/core-composer-scaffold",
|
|
"name": "drupal/core-composer-scaffold",
|
|
"version": "9.3.12",
|
|
"version": "9.3.12",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
"url": "https://github.com/drupal/core-composer-scaffold.git",
|
|
"url": "https://github.com/drupal/core-composer-scaffold.git",
|
|
@@ -4123,21 +4081,13 @@
|
|
"drupal"
|
|
"drupal"
|
|
],
|
|
],
|
|
"support": {
|
|
"support": {
|
|
-<<<<<<< HEAD
|
|
|
|
- "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9"
|
|
|
|
-=======
|
|
|
|
"source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
|
|
"source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
"time": "2022-02-24T17:40:56+00:00"
|
|
"time": "2022-02-24T17:40:56+00:00"
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/core-project-message",
|
|
"name": "drupal/core-project-message",
|
|
-<<<<<<< HEAD
|
|
|
|
- "version": "9.3.9",
|
|
|
|
-=======
|
|
|
|
"version": "9.3.12",
|
|
"version": "9.3.12",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
"url": "https://github.com/drupal/core-project-message.git",
|
|
"url": "https://github.com/drupal/core-project-message.git",
|
|
@@ -4172,28 +4122,12 @@
|
|
"drupal"
|
|
"drupal"
|
|
],
|
|
],
|
|
"support": {
|
|
"support": {
|
|
-<<<<<<< HEAD
|
|
|
|
- "source": "https://github.com/drupal/core-project-message/tree/9.3.9"
|
|
|
|
-=======
|
|
|
|
"source": "https://github.com/drupal/core-project-message/tree/9.3.12"
|
|
"source": "https://github.com/drupal/core-project-message/tree/9.3.12"
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
"time": "2022-02-24T17:40:56+00:00"
|
|
"time": "2022-02-24T17:40:56+00:00"
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/core-recommended",
|
|
"name": "drupal/core-recommended",
|
|
-<<<<<<< HEAD
|
|
|
|
- "version": "9.3.9",
|
|
|
|
- "source": {
|
|
|
|
- "type": "git",
|
|
|
|
- "url": "https://github.com/drupal/core-recommended.git",
|
|
|
|
- "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
|
|
|
|
- },
|
|
|
|
- "dist": {
|
|
|
|
- "type": "zip",
|
|
|
|
- "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
|
|
|
|
- "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
|
|
|
|
-=======
|
|
|
|
"version": "9.3.12",
|
|
"version": "9.3.12",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
@@ -4204,7 +4138,6 @@
|
|
"type": "zip",
|
|
"type": "zip",
|
|
"url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
|
|
"url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
|
|
"reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
|
|
"reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
@@ -4213,11 +4146,7 @@
|
|
"doctrine/annotations": "1.13.2",
|
|
"doctrine/annotations": "1.13.2",
|
|
"doctrine/lexer": "1.2.1",
|
|
"doctrine/lexer": "1.2.1",
|
|
"doctrine/reflection": "1.2.2",
|
|
"doctrine/reflection": "1.2.2",
|
|
-<<<<<<< HEAD
|
|
|
|
- "drupal/core": "9.3.9",
|
|
|
|
-=======
|
|
|
|
"drupal/core": "9.3.12",
|
|
"drupal/core": "9.3.12",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"egulias/email-validator": "3.1.2",
|
|
"egulias/email-validator": "3.1.2",
|
|
"guzzlehttp/guzzle": "6.5.5",
|
|
"guzzlehttp/guzzle": "6.5.5",
|
|
"guzzlehttp/promises": "1.5.1",
|
|
"guzzlehttp/promises": "1.5.1",
|
|
@@ -4279,15 +4208,9 @@
|
|
],
|
|
],
|
|
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
|
|
"description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
|
|
"support": {
|
|
"support": {
|
|
-<<<<<<< HEAD
|
|
|
|
- "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
|
|
|
|
- },
|
|
|
|
- "time": "2022-03-21T21:21:58+00:00"
|
|
|
|
-=======
|
|
|
|
"source": "https://github.com/drupal/core-recommended/tree/9.3.12"
|
|
"source": "https://github.com/drupal/core-recommended/tree/9.3.12"
|
|
},
|
|
},
|
|
"time": "2022-04-20T14:25:27+00:00"
|
|
"time": "2022-04-20T14:25:27+00:00"
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/cshs",
|
|
"name": "drupal/cshs",
|
|
@@ -5406,13 +5329,8 @@
|
|
"type": "drupal-module",
|
|
"type": "drupal-module",
|
|
"extra": {
|
|
"extra": {
|
|
"drupal": {
|
|
"drupal": {
|
|
-<<<<<<< HEAD
|
|
|
|
"version": "8.x-3.2",
|
|
"version": "8.x-3.2",
|
|
"datestamp": "1628513585",
|
|
"datestamp": "1628513585",
|
|
-=======
|
|
|
|
- "version": "8.x-3.2+7-dev",
|
|
|
|
- "datestamp": "1635152929",
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"security-coverage": {
|
|
"security-coverage": {
|
|
"status": "covered",
|
|
"status": "covered",
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
@@ -5765,7 +5683,6 @@
|
|
"type": "drupal-module",
|
|
"type": "drupal-module",
|
|
"extra": {
|
|
"extra": {
|
|
"drupal": {
|
|
"drupal": {
|
|
-
|
|
|
|
"version": "8.x-1.39",
|
|
"version": "8.x-1.39",
|
|
"datestamp": "1649534200",
|
|
"datestamp": "1649534200",
|
|
"security-coverage": {
|
|
"security-coverage": {
|
|
@@ -7216,19 +7133,6 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/matomo",
|
|
"name": "drupal/matomo",
|
|
-<<<<<<< HEAD
|
|
|
|
- "version": "1.17.0",
|
|
|
|
- "source": {
|
|
|
|
- "type": "git",
|
|
|
|
- "url": "https://git.drupalcode.org/project/matomo.git",
|
|
|
|
- "reference": "8.x-1.17"
|
|
|
|
- },
|
|
|
|
- "dist": {
|
|
|
|
- "type": "zip",
|
|
|
|
- "url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.17.zip",
|
|
|
|
- "reference": "8.x-1.17",
|
|
|
|
- "shasum": "091f946ec7a09d6b4463e5d75adca9cdcdff2918"
|
|
|
|
-=======
|
|
|
|
"version": "1.18.0",
|
|
"version": "1.18.0",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
@@ -7240,7 +7144,6 @@
|
|
"url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.18.zip",
|
|
"url": "https://ftp.drupal.org/files/projects/matomo-8.x-1.18.zip",
|
|
"reference": "8.x-1.18",
|
|
"reference": "8.x-1.18",
|
|
"shasum": "ad0d24ba12bca16e666a5f9d404cd56926839169"
|
|
"shasum": "ad0d24ba12bca16e666a5f9d404cd56926839169"
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
"drupal/core": "^8.8.0 || ^9.0.0"
|
|
"drupal/core": "^8.8.0 || ^9.0.0"
|
|
@@ -7256,13 +7159,8 @@
|
|
"type": "drupal-module",
|
|
"type": "drupal-module",
|
|
"extra": {
|
|
"extra": {
|
|
"drupal": {
|
|
"drupal": {
|
|
-<<<<<<< HEAD
|
|
|
|
- "version": "8.x-1.17",
|
|
|
|
- "datestamp": "1647206848",
|
|
|
|
-=======
|
|
|
|
"version": "8.x-1.18",
|
|
"version": "8.x-1.18",
|
|
"datestamp": "1649792938",
|
|
"datestamp": "1649792938",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"security-coverage": {
|
|
"security-coverage": {
|
|
"status": "covered",
|
|
"status": "covered",
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
@@ -7897,11 +7795,7 @@
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
"url": "https://git.drupalcode.org/project/paragraphs.git",
|
|
"url": "https://git.drupalcode.org/project/paragraphs.git",
|
|
-<<<<<<< HEAD
|
|
|
|
- "reference": "80e4c5bfbfbf27d4cb59a228c0011ce81496ba76"
|
|
|
|
-=======
|
|
|
|
"reference": "6a75a6148bc31ffc5662c9a8130d32ec16aaaf6f"
|
|
"reference": "6a75a6148bc31ffc5662c9a8130d32ec16aaaf6f"
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
"drupal/core": "^9.2",
|
|
"drupal/core": "^9.2",
|
|
@@ -7929,13 +7823,8 @@
|
|
"dev-1.x": "1.x-dev"
|
|
"dev-1.x": "1.x-dev"
|
|
},
|
|
},
|
|
"drupal": {
|
|
"drupal": {
|
|
-<<<<<<< HEAD
|
|
|
|
- "version": "8.x-1.13+5-dev",
|
|
|
|
- "datestamp": "1646129836",
|
|
|
|
-=======
|
|
|
|
"version": "8.x-1.13+11-dev",
|
|
"version": "8.x-1.13+11-dev",
|
|
"datestamp": "1650520402",
|
|
"datestamp": "1650520402",
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"security-coverage": {
|
|
"security-coverage": {
|
|
"status": "not-covered",
|
|
"status": "not-covered",
|
|
"message": "Dev releases are not covered by Drupal security advisories."
|
|
"message": "Dev releases are not covered by Drupal security advisories."
|
|
@@ -9473,7 +9362,6 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "drupal/views_bulk_operations",
|
|
"name": "drupal/views_bulk_operations",
|
|
-<<<<<<< HEAD
|
|
|
|
"version": "3.13.0",
|
|
"version": "3.13.0",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
@@ -9485,22 +9373,9 @@
|
|
"url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
|
|
"url": "https://ftp.drupal.org/files/projects/views_bulk_operations-8.x-3.13.zip",
|
|
"reference": "8.x-3.13",
|
|
"reference": "8.x-3.13",
|
|
"shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
|
|
"shasum": "70583d08b91be3b5e008f571589425c2176eb73b"
|
|
-=======
|
|
|
|
- "version": "4.1.2",
|
|
|
|
- "source": {
|
|
|
|
- "type": "git",
|
|
|
|
- "url": "https://git.drupalcode.org/project/views_bulk_operations.git",
|
|
|
|
- "reference": "4.1.2"
|
|
|
|
- },
|
|
|
|
- "dist": {
|
|
|
|
- "type": "zip",
|
|
|
|
- "url": "https://ftp.drupal.org/files/projects/views_bulk_operations-4.1.2.zip",
|
|
|
|
- "reference": "4.1.2",
|
|
|
|
- "shasum": "1cfa10f755240cae46de8d8684272a9a8907a730"
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
- "drupal/core": "^9"
|
|
|
|
|
|
+ "drupal/core": "^8.8 || ^9"
|
|
},
|
|
},
|
|
"require-dev": {
|
|
"require-dev": {
|
|
"drush/drush": "^10"
|
|
"drush/drush": "^10"
|
|
@@ -9511,13 +9386,8 @@
|
|
"type": "drupal-module",
|
|
"type": "drupal-module",
|
|
"extra": {
|
|
"extra": {
|
|
"drupal": {
|
|
"drupal": {
|
|
-<<<<<<< HEAD
|
|
|
|
"version": "8.x-3.13",
|
|
"version": "8.x-3.13",
|
|
"datestamp": "1619697066",
|
|
"datestamp": "1619697066",
|
|
-=======
|
|
|
|
- "version": "4.1.2",
|
|
|
|
- "datestamp": "1647943086",
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"security-coverage": {
|
|
"security-coverage": {
|
|
"status": "covered",
|
|
"status": "covered",
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
"message": "Covered by Drupal's security advisory policy"
|
|
@@ -12310,7 +12180,6 @@
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "psy/psysh",
|
|
"name": "psy/psysh",
|
|
-<<<<<<< HEAD
|
|
|
|
"version": "v0.10.12",
|
|
"version": "v0.10.12",
|
|
"source": {
|
|
"source": {
|
|
"type": "git",
|
|
"type": "git",
|
|
@@ -12321,18 +12190,6 @@
|
|
"type": "zip",
|
|
"type": "zip",
|
|
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
|
|
"url": "https://api.github.com/repos/bobthecow/psysh/zipball/a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
|
|
"reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
|
|
"reference": "a0d9981aa07ecfcbea28e4bfa868031cca121e7d",
|
|
-=======
|
|
|
|
- "version": "v0.11.2",
|
|
|
|
- "source": {
|
|
|
|
- "type": "git",
|
|
|
|
- "url": "https://github.com/bobthecow/psysh.git",
|
|
|
|
- "reference": "7f7da640d68b9c9fec819caae7c744a213df6514"
|
|
|
|
- },
|
|
|
|
- "dist": {
|
|
|
|
- "type": "zip",
|
|
|
|
- "url": "https://api.github.com/repos/bobthecow/psysh/zipball/7f7da640d68b9c9fec819caae7c744a213df6514",
|
|
|
|
- "reference": "7f7da640d68b9c9fec819caae7c744a213df6514",
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
"shasum": ""
|
|
"shasum": ""
|
|
},
|
|
},
|
|
"require": {
|
|
"require": {
|
|
@@ -12343,9 +12200,6 @@
|
|
"symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10",
|
|
"symfony/console": "~5.0|~4.0|~3.0|^2.4.2|~2.3.10",
|
|
"symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7"
|
|
"symfony/var-dumper": "~5.0|~4.0|~3.0|~2.7"
|
|
},
|
|
},
|
|
- "conflict": {
|
|
|
|
- "symfony/console": "4.4.37 || 5.3.14 || 5.3.15 || 5.4.3 || 5.4.4 || 6.0.3 || 6.0.4"
|
|
|
|
- },
|
|
|
|
"require-dev": {
|
|
"require-dev": {
|
|
"bamarni/composer-bin-plugin": "^1.2",
|
|
"bamarni/composer-bin-plugin": "^1.2",
|
|
"hoa/console": "3.17.*"
|
|
"hoa/console": "3.17.*"
|
|
@@ -12395,15 +12249,9 @@
|
|
],
|
|
],
|
|
"support": {
|
|
"support": {
|
|
"issues": "https://github.com/bobthecow/psysh/issues",
|
|
"issues": "https://github.com/bobthecow/psysh/issues",
|
|
-<<<<<<< HEAD
|
|
|
|
"source": "https://github.com/bobthecow/psysh/tree/v0.10.12"
|
|
"source": "https://github.com/bobthecow/psysh/tree/v0.10.12"
|
|
},
|
|
},
|
|
"time": "2021-11-30T14:05:36+00:00"
|
|
"time": "2021-11-30T14:05:36+00:00"
|
|
-=======
|
|
|
|
- "source": "https://github.com/bobthecow/psysh/tree/v0.11.2"
|
|
|
|
- },
|
|
|
|
- "time": "2022-02-28T15:28:54+00:00"
|
|
|
|
->>>>>>> fa8d7c43473773cd259f19ae4a05136f767aa50d
|
|
|
|
},
|
|
},
|
|
{
|
|
{
|
|
"name": "ralouphie/getallheaders",
|
|
"name": "ralouphie/getallheaders",
|