Merge pull request #23960 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.5.3

author John Molakvoæ <skjnldsv@users.noreply.github.com>

Sat, 7 Nov 2020 09:36:43 +0000 (10:36 +0100)

committer GitHub <noreply@github.com>

Sat, 7 Nov 2020 09:36:43 +0000 (10:36 +0100)
author John Molakvoæ <skjnldsv@users.noreply.github.com>
Sat, 7 Nov 2020 09:36:43 +0000 (10:36 +0100)
committer GitHub <noreply@github.com>
Sat, 7 Nov 2020 09:36:43 +0000 (10:36 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	John Molakvoæ <skjnldsv@users.noreply.github.com>
	Sat, 7 Nov 2020 09:36:43 +0000 (10:36 +0100)
committer	GitHub <noreply@github.com>
	Sat, 7 Nov 2020 09:36:43 +0000 (10:36 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history