Merge branch 'MDL-62143-master' of git://github.com/damyon/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 5 Mar 2019 01:44:59 +0000 (09:44 +0800)
committerJun Pataleta <jun@moodle.com>
Tue, 5 Mar 2019 01:44:59 +0000 (09:44 +0800)
1  2 
lib/outputrenderers.php
lib/templates/navbar.mustache

Simple merge
Simple merge