Merge pull request #22148 from nextcloud/dependabot/npm_and_yarn/bootstrap-4.5.2

author Morris Jobke <hey@morrisjobke.de>

Tue, 11 Aug 2020 07:46:23 +0000 (09:46 +0200)

committer GitHub <noreply@github.com>

Tue, 11 Aug 2020 07:46:23 +0000 (09:46 +0200)
author Morris Jobke <hey@morrisjobke.de>
Tue, 11 Aug 2020 07:46:23 +0000 (09:46 +0200)
committer GitHub <noreply@github.com>
Tue, 11 Aug 2020 07:46:23 +0000 (09:46 +0200)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Tue, 11 Aug 2020 07:46:23 +0000 (09:46 +0200)
committer	GitHub <noreply@github.com>
	Tue, 11 Aug 2020 07:46:23 +0000 (09:46 +0200)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history