Merge branch 'MDL-60567-master' of git://github.com/damyon/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Dec 2017 10:30:08 +0000 (11:30 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 19 Dec 2017 10:30:08 +0000 (11:30 +0100)
1  2 
competency/tests/external_test.php

Simple merge