Merge branch 'MDL-57118-master' of git://github.com/damyon/moodle
authorDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 09:26:52 +0000 (09:26 +0000)
committerDan Poltawski <dan@moodle.com>
Thu, 24 Nov 2016 09:26:52 +0000 (09:26 +0000)
commitc5c8f3a6f501fa565923491cd8dc281b21b1d36d
tree154dd289711ab613447895e93cd3b0e03624a128
parent86ac6a3763ae9aefeb0da95f973d99fb4f8d2f90
parenta955cf531cc905d19fd8ccdd4a41766679737955
Merge branch 'MDL-57118-master' of git://github.com/damyon/moodle
theme/boost/classes/output/core_renderer.php