Merge branch 'MDL-53140-master' of git://github.com/rezaies/moodle

author Adrian Greeve <abgreeve@gmail.com>

Wed, 1 May 2019 02:30:22 +0000 (10:30 +0800)

committer Adrian Greeve <abgreeve@gmail.com>

Wed, 1 May 2019 02:30:22 +0000 (10:30 +0800)
author Adrian Greeve <abgreeve@gmail.com>
Wed, 1 May 2019 02:30:22 +0000 (10:30 +0800)
committer Adrian Greeve <abgreeve@gmail.com>
Wed, 1 May 2019 02:30:22 +0000 (10:30 +0800)
diff --cc lib/formslib.php
Simple merge
diff --cc lib/questionlib.php
Simple merge
author	Adrian Greeve <abgreeve@gmail.com>
	Wed, 1 May 2019 02:30:22 +0000 (10:30 +0800)
committer	Adrian Greeve <abgreeve@gmail.com>
	Wed, 1 May 2019 02:30:22 +0000 (10:30 +0800)
		1	2
lib/formslib.php	patch \|	diff1 \|	diff2 \|	blob \| history
lib/questionlib.php	patch \|	diff1 \|	diff2 \|	blob \| history