Merge pull request #2 from mtmail/dependabot/npm_and_yarn/bootstrap-3.4.1

author mtmail <mtmail@gmx.net>

Sat, 30 Nov 2019 13:57:32 +0000 (14:57 +0100)

committer GitHub <noreply@github.com>

Sat, 30 Nov 2019 13:57:32 +0000 (14:57 +0100)
author mtmail <mtmail@gmx.net>
Sat, 30 Nov 2019 13:57:32 +0000 (14:57 +0100)
committer GitHub <noreply@github.com>
Sat, 30 Nov 2019 13:57:32 +0000 (14:57 +0100)
diff --cc package.json
Simple merge
diff --cc yarn.lock
Simple merge
author	mtmail <mtmail@gmx.net>
	Sat, 30 Nov 2019 13:57:32 +0000 (14:57 +0100)
committer	GitHub <noreply@github.com>
	Sat, 30 Nov 2019 13:57:32 +0000 (14:57 +0100)
		1	2
package.json	patch \|	diff1 \|	diff2 \|	blob \| history
yarn.lock	patch \|	diff1 \|	diff2 \|	blob \| history