Merge branch 'MDL-70153-master' of git://github.com/dpalou/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 26 Nov 2020 03:17:36 +0000 (11:17 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Nov 2020 11:46:10 +0000 (12:46 +0100)
commit22388c9e7f00b2742839861d861a4fb0e543e798
tree411d4a77ffa17c63009850fb4f0a047c3e3d46a7
parent78999ae627f373ac43c7399c437fae762f1ca338
parent98dac07d5473d3ee5d29438e93b32bd4476c4c42
Merge branch 'MDL-70153-master' of git://github.com/dpalou/moodle