Merge branch 'MDL-56321-master' of git://github.com/damyon/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Oct 2016 05:29:31 +0000 (13:29 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 24 Oct 2016 05:29:31 +0000 (13:29 +0800)
commit33492029de537dfe0403a8d034be15a6da6b2d94
treead57aa6a5371e35411378c64711b3afd1035a493
parentc10cd185a9f3b5f1e24dfb1405a6f370ec73d2ef
parentdf25a884e83954e9c7a6fa38ada8a7db75c4552d
Merge branch 'MDL-56321-master' of git://github.com/damyon/moodle
theme/boost/classes/output/core_renderer.php
theme/boost/scss/preset-default.scss