Merge branch 'MDL-55314-master' of https://github.com/mrmark/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:16:07 +0000 (17:16 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 2 Aug 2016 15:16:07 +0000 (17:16 +0200)
1  2 
mod/lti/tests/externallib_test.php

Simple merge