Merge branch 'MDL-70912-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE
commit2baf0175f93b1c2b486237749f64d34f01ced43a
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Mar 2021 15:47:37 +0000 (1 16:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 1 Mar 2021 15:47:37 +0000 (1 16:47 +0100)
tree636a1f0aa0e89d12ddef80c31322ec4c782d111e
parentaddd1937c1d00c5ba97ff4b8c7ecf22423bc9a34
parentd0840f514c34dcb7ddf0b06be18a52e05952229d
Merge branch 'MDL-70912-311' of git://github.com/sarjona/moodle into MOODLE_311_STABLE