Merge branch 'MDL-68343-master' of git://github.com/rezaies/moodle
authorSara Arjona <sara@moodle.com>
Wed, 27 May 2020 13:09:39 +0000 (15:09 +0200)
committerSara Arjona <sara@moodle.com>
Wed, 27 May 2020 13:09:39 +0000 (15:09 +0200)
1  2 
lib/outputcomponents.php

Simple merge