Merge branch 'MDL-69156_310' of https://github.com/ffhs/moodle into MOODLE_310_STABLE
authorAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2020 03:52:07 +0000 (11:52 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Fri, 30 Oct 2020 03:52:07 +0000 (11:52 +0800)
commit6a64b9c5b78564b5fbf4759412dbee81489c0eb4
treedcd6670ab340f9712eb5aaf79ae257c58acb67bf
parent04569f819f38585907a9a95a2da0edabc180d5cf
parenta850fa5de80051efbbf3c36333713f670268f24e
Merge branch 'MDL-69156_310' of https://github.com/ffhs/moodle into MOODLE_310_STABLE