Merge pull request #22687 from nextcloud/dependabot/npm_and_yarn/query-string-6.13.1

author Morris Jobke <hey@morrisjobke.de>

Thu, 10 Sep 2020 10:51:00 +0000 (12:51 +0200)

committer GitHub <noreply@github.com>

Thu, 10 Sep 2020 10:51:00 +0000 (12:51 +0200)
author Morris Jobke <hey@morrisjobke.de>
Thu, 10 Sep 2020 10:51:00 +0000 (12:51 +0200)
committer GitHub <noreply@github.com>
Thu, 10 Sep 2020 10:51:00 +0000 (12:51 +0200)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	Morris Jobke <hey@morrisjobke.de>
	Thu, 10 Sep 2020 10:51:00 +0000 (12:51 +0200)
committer	GitHub <noreply@github.com>
	Thu, 10 Sep 2020 10:51:00 +0000 (12:51 +0200)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history