Merge branch 'MDL-69868-310' of git://github.com/ilya-catalyst/moodle into MOODLE_310...
commitd552427f61355e8c4357050be6cc77b8b3193fbf
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2020 23:47:48 +0000 (3 07:47 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 2 Dec 2020 23:47:48 +0000 (3 07:47 +0800)
treec731bf91bb57cecb8b6c6df566fa5c1480239f0d
parent6be44e7d062577471ab895dfb1e11e5008f555fe
parentd8c8f544b346f05da3a8eebd561a2106f3bfc349
Merge branch 'MDL-69868-310' of git://github.com/ilya-catalyst/moodle into MOODLE_310_STABLE