Merge branch 'MDL-61410-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Mar 2018 22:53:28 +0000 (23:53 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 20 Mar 2018 22:53:28 +0000 (23:53 +0100)
1  2 
lib/questionlib.php
lib/tests/questionlib_test.php

Simple merge
Simple merge