Merge branch 'wip-MDL-62138-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:46:27 +0000 (11:46 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 1 May 2018 03:46:27 +0000 (11:46 +0800)
1  2 
lib/classes/component.php
lib/tests/component_test.php

Simple merge
Simple merge