Merge branch 'MDL-59261-master' of git://github.com/ryanwyllie/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 3 Jul 2018 06:44:32 +0000 (14:44 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 3 Jul 2018 06:44:32 +0000 (14:44 +0800)
1  2 
lib/outputlib.php

Simple merge