Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle
commit76e337ab96c1e4c78ef996af70d4677a796ac2cd
authorDavid Monllao <davidm@moodle.com>
Fri, 2 Dec 2016 06:20:17 +0000 (2 14:20 +0800)
committerDavid Monllao <davidm@moodle.com>
Fri, 2 Dec 2016 06:20:17 +0000 (2 14:20 +0800)
tree9ae97b23a2bfbf04b3706a00a3dc860dc08460a6
parent80ee8a3eb09a3e94d6b903d39986b215013938b8
parent9d1402abd8aba96cb5ad18a76c13146deeace2a6
Merge branch 'MDL-57232-master' of git://github.com/damyon/moodle
lib/outputlib.php