Merge branch 'MDL-62347-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 12:05:41 +0000 (14:05 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 4 Sep 2018 12:05:41 +0000 (14:05 +0200)
1  2 
course/classes/management_renderer.php
lib/outputrenderers.php

Simple merge