Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle
authorDamyon Wiese <damyon@moodle.com>
Tue, 5 Nov 2013 03:06:23 +0000 (11:06 +0800)
committerDamyon Wiese <damyon@moodle.com>
Tue, 5 Nov 2013 03:06:23 +0000 (11:06 +0800)
commit1ddbe7815d0d7344d48f93073252ddccf0149dd4
tree65d6bb1632a40c6fc53333ff46e54854aa8313e1
parent82d305fafabbd4e77e6a4940f66d69d698941cdf
parentd3bd747db4470b0496ed6f806bb213789691364a
Merge branch 'wip-MDL-42318-master' of https://github.com/marinaglancy/moodle
course/classes/management_renderer.php
lib/coursecatlib.php