Merge pull request #35407 from Jerome-Herbinet/patch-12

author Simon L <szaimen@e.mail.de>

Thu, 24 Nov 2022 18:01:26 +0000 (19:01 +0100)

committer GitHub <noreply@github.com>

Thu, 24 Nov 2022 18:01:26 +0000 (19:01 +0100)
author Simon L <szaimen@e.mail.de>
Thu, 24 Nov 2022 18:01:26 +0000 (19:01 +0100)
committer GitHub <noreply@github.com>
Thu, 24 Nov 2022 18:01:26 +0000 (19:01 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Simon L <szaimen@e.mail.de>
	Thu, 24 Nov 2022 18:01:26 +0000 (19:01 +0100)
committer	GitHub <noreply@github.com>
	Thu, 24 Nov 2022 18:01:26 +0000 (19:01 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history