Merge branch 'MDL-59380-master' of git://github.com/damyon/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 4 Jul 2017 08:27:30 +0000 (16:27 +0800)
committerJake Dallimore <jake@moodle.com>
Tue, 4 Jul 2017 08:27:30 +0000 (16:27 +0800)
1  2 
lib/outputrenderers.php

Simple merge