Merge branch 'MDL-69526-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE
commit7bb692666be4e81611a11b0e591fe8c0b6df5114
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 06:55:10 +0000 (17 14:55 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Nov 2020 06:55:10 +0000 (17 14:55 +0800)
tree419ce5d3d75515c876cd44bb6482e4683b6c652c
parent5e924f295a6d1fa7fdd9c07b54056422441e6388
parente29069d45b793edb81763bddee47b21a6fe7be13
Merge branch 'MDL-69526-310' of git://github.com/lucaboesch/moodle into MOODLE_310_STABLE