Merge branch 'MDL-61135-master' of git://github.com/ryanwyllie/moodle

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

Mon, 12 Feb 2018 03:34:56 +0000 (11:34 +0800)

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

Mon, 12 Feb 2018 03:34:56 +0000 (11:34 +0800)
author Andrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 03:34:56 +0000 (11:34 +0800)
committer Andrew Nicols <andrew@nicols.co.uk>
Mon, 12 Feb 2018 03:34:56 +0000 (11:34 +0800)
diff --cc lang/en/question.php
Simple merge
diff --cc question/classes/bank/view.php
Simple merge
diff --cc question/editlib.php
Simple merge
author	Andrew Nicols <andrew@nicols.co.uk>
	Mon, 12 Feb 2018 03:34:56 +0000 (11:34 +0800)
committer	Andrew Nicols <andrew@nicols.co.uk>
	Mon, 12 Feb 2018 03:34:56 +0000 (11:34 +0800)
		1	2
lang/en/question.php	patch \|	diff1 \|	diff2 \|	blob \| history
question/classes/bank/view.php	patch \|	diff1 \|	diff2 \|	blob \| history
question/editlib.php	patch \|	diff1 \|	diff2 \|	blob \| history