Merge branch 'MDL-63958-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Mon, 21 Jan 2019 14:17:53 +0000 (15:17 +0100)
committerSara Arjona <sara@moodle.com>
Mon, 21 Jan 2019 14:17:53 +0000 (15:17 +0100)
1  2 
course/tests/externallib_test.php
mod/resource/locallib.php

Simple merge
Simple merge