Merge pull request #17023 from nextcloud/refactor/select2-from-npm

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

Sun, 8 Sep 2019 07:06:24 +0000 (09:06 +0200)

committer GitHub <noreply@github.com>

Sun, 8 Sep 2019 07:06:24 +0000 (09:06 +0200)
author John Molakvoæ <skjnldsv@users.noreply.github.com>
Sun, 8 Sep 2019 07:06:24 +0000 (09:06 +0200)
committer GitHub <noreply@github.com>
Sun, 8 Sep 2019 07:06:24 +0000 (09:06 +0200)
diff --cc package-lock.json
Simple merge
diff --cc package.json
Simple merge
author	John Molakvoæ <skjnldsv@users.noreply.github.com>
	Sun, 8 Sep 2019 07:06:24 +0000 (09:06 +0200)
committer	GitHub <noreply@github.com>
	Sun, 8 Sep 2019 07:06:24 +0000 (09:06 +0200)
		1	2
package-lock.json	patch \|	diff1 \|	diff2 \|	blob \| history
package.json	patch \|	diff1 \|	diff2 \|	blob \| history