Merge branch 'wip-MDL-61864-master' of git://github.com/marinaglancy/moodle

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

Wed, 18 Apr 2018 04:01:29 +0000 (12:01 +0800)

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

Wed, 18 Apr 2018 04:01:29 +0000 (12:01 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 04:01:29 +0000 (12:01 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Wed, 18 Apr 2018 04:01:29 +0000 (12:01 +0800)
diff --cc .eslintignore
Simple merge
diff --cc .stylelintignore
Simple merge
diff --cc lib/classes/plugin_manager.php
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Wed, 18 Apr 2018 04:01:29 +0000 (12:01 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Wed, 18 Apr 2018 04:01:29 +0000 (12:01 +0800)
		1	2
.eslintignore	patch \|	diff1 \|	diff2 \|	blob \| history
.stylelintignore	patch \|	diff1 \|	diff2 \|	blob \| history
lib/classes/plugin_manager.php	patch \|	diff1 \|	diff2 \|	blob \| history