Merge branch 'MDL-66113-master' of git://github.com/jleyva/moodle
authorSara Arjona <sara@moodle.com>
Tue, 17 Sep 2019 10:03:42 +0000 (12:03 +0200)
committerSara Arjona <sara@moodle.com>
Tue, 17 Sep 2019 10:03:42 +0000 (12:03 +0200)

Trivial merge