Merge branch 'MDL-59758-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 7 Nov 2017 11:37:30 +0000 (12:37 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 7 Nov 2017 11:37:30 +0000 (12:37 +0100)
1  2 
user/renderer.php

Simple merge