Merge branch 'wip-MDL-59411-master' of git://github.com/marinaglancy/moodle
authorDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
committerDavid Monllao <david.monllao@gmail.com>
Mon, 17 Jul 2017 13:48:12 +0000 (15:48 +0200)
commitbf442807f5c6e6effb43e1dfb0106535648689f3
treedf09b43437e98aa453b3c19095e0ea39d276fa95
parentefc1d2bb6b396fbc359dba569a261dc40fdd6694
parent592f3ae22c906093bbc26e91a61359c44b255e77
Merge branch 'wip-MDL-59411-master' of git://github.com/marinaglancy/moodle
course/renderer.php
lib/moodlelib.php