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