Merge branch 'MDL-67708-master' of git://github.com/vmdef/moodle

author Andrew Nicols <andrew@nicols.co.uk>

Thu, 13 Aug 2020 00:11:09 +0000 (08:11 +0800)

committer Andrew Nicols <andrew@nicols.co.uk>

Thu, 13 Aug 2020 00:11:09 +0000 (08:11 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 00:11:09 +0000 (08:11 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Thu, 13 Aug 2020 00:11:09 +0000 (08:11 +0800)
diff --cc .eslintignore
Simple merge
diff --cc .stylelintignore
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Thu, 13 Aug 2020 00:11:09 +0000 (08:11 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Thu, 13 Aug 2020 00:11:09 +0000 (08:11 +0800)
		1	2
.eslintignore	patch \|	diff1 \|	diff2 \|	blob \| history
.stylelintignore	patch \|	diff1 \|	diff2 \|	blob \| history