Merge branch 'MDL-66849-master' of https://github.com/ised-isde-canada/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 23:01:32 +0000 (01:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 15 Apr 2020 23:01:32 +0000 (01:01 +0200)
1  2 
lib/outputcomponents.php

Simple merge