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)
1  2 
course/renderer.php
lib/moodlelib.php

Simple merge
Simple merge