Merge branch 'MDL-71434' of git://github.com/paulholden/moodle
authorVíctor Déniz <victor@moodle.com>
Thu, 6 May 2021 10:11:40 +0000 (11:11 +0100)
committerVíctor Déniz <victor@moodle.com>
Thu, 6 May 2021 10:11:40 +0000 (11:11 +0100)
1  2 
mod/data/templates.php

Simple merge