Merge pull request #31147 from nextcloud/dependabot/npm_and_yarn/karma-6.3.16

author Louis <6653109+artonge@users.noreply.github.com>

Mon, 14 Feb 2022 11:21:24 +0000 (12:21 +0100)

committer GitHub <noreply@github.com>

Mon, 14 Feb 2022 11:21:24 +0000 (12:21 +0100)
author Louis <6653109+artonge@users.noreply.github.com>
Mon, 14 Feb 2022 11:21:24 +0000 (12:21 +0100)
committer GitHub <noreply@github.com>
Mon, 14 Feb 2022 11:21:24 +0000 (12:21 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Louis <6653109+artonge@users.noreply.github.com>
	Mon, 14 Feb 2022 11:21:24 +0000 (12:21 +0100)
committer	GitHub <noreply@github.com>
	Mon, 14 Feb 2022 11:21:24 +0000 (12:21 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history