Merge branch 'MDL-70143-310' of git://github.com/marinaglancy/moodle into MOODLE_310_...
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:51:54 +0000 (19:51 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 6 Nov 2020 18:51:54 +0000 (19:51 +0100)
commitfcb699808c9cb019a9d4d33f80c29b8eb0188f05
tree2729ee522892d1f99225526160fbe92a906a44f0
parentf9dc16ca0521d123f28744fed462734d4e147b93
parenta350376b65d3e63a09bd3b107437f8f1843a36c2
Merge branch 'MDL-70143-310' of git://github.com/marinaglancy/moodle into MOODLE_310_STABLE