Merge pull request #43465 from nextcloud/artonge/fix/bad_revert_commit

author Louis <louis@chmn.me>

Thu, 8 Feb 2024 22:59:36 +0000 (23:59 +0100)

committer GitHub <noreply@github.com>

Thu, 8 Feb 2024 22:59:36 +0000 (23:59 +0100)
author Louis <louis@chmn.me>
Thu, 8 Feb 2024 22:59:36 +0000 (23:59 +0100)
committer GitHub <noreply@github.com>
Thu, 8 Feb 2024 22:59:36 +0000 (23:59 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Louis <louis@chmn.me>
	Thu, 8 Feb 2024 22:59:36 +0000 (23:59 +0100)
committer	GitHub <noreply@github.com>
	Thu, 8 Feb 2024 22:59:36 +0000 (23:59 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history