Merge pull request #18667 from nextcloud/dependabot/npm_and_yarn/eslint-config-nextcl...

author Roeland Jago Douma <rullzer@users.noreply.github.com>

Sun, 5 Jan 2020 12:39:30 +0000 (13:39 +0100)

committer GitHub <noreply@github.com>

Sun, 5 Jan 2020 12:39:30 +0000 (13:39 +0100)
author Roeland Jago Douma <rullzer@users.noreply.github.com>
Sun, 5 Jan 2020 12:39:30 +0000 (13:39 +0100)
committer GitHub <noreply@github.com>
Sun, 5 Jan 2020 12:39:30 +0000 (13:39 +0100)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Roeland Jago Douma <rullzer@users.noreply.github.com>
	Sun, 5 Jan 2020 12:39:30 +0000 (13:39 +0100)
committer	GitHub <noreply@github.com>
	Sun, 5 Jan 2020 12:39:30 +0000 (13:39 +0100)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history