Merge branch 'MDL-70146_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Nov 2020 02:01:19 +0000 (10:01 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Nov 2020 02:01:19 +0000 (10:01 +0800)
commitd0295d8ff2383fd89ffa73ed42cfa83381d6c790
tree37f6f192bde16bc5a712b92b38a3b763f2ee5dcb
parentec58cefefb2722f61f77c9a2b6a12d40a8c078a0
parent4aa83d92bfe58f7b0a3af77c95bab205cdd8ce32
Merge branch 'MDL-70146_310' of https://github.com/stronk7/moodle into MOODLE_310_STABLE