Merge pull request #27237 from nextcloud/dependabot/npm_and_yarn/stable21/moment...

author Julius Härtl <jus@bitgrid.net>

Wed, 23 Jun 2021 08:57:22 +0000 (10:57 +0200)

committer GitHub <noreply@github.com>

Wed, 23 Jun 2021 08:57:22 +0000 (10:57 +0200)
author Julius Härtl <jus@bitgrid.net>
Wed, 23 Jun 2021 08:57:22 +0000 (10:57 +0200)
committer GitHub <noreply@github.com>
Wed, 23 Jun 2021 08:57:22 +0000 (10:57 +0200)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Julius Härtl <jus@bitgrid.net>
	Wed, 23 Jun 2021 08:57:22 +0000 (10:57 +0200)
committer	GitHub <noreply@github.com>
	Wed, 23 Jun 2021 08:57:22 +0000 (10:57 +0200)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history