Merge branch 'MDL-59081-master' of git://github.com/abgreeve/moodle
authorDavid Monllaó <davidm@moodle.com>
Wed, 10 Apr 2019 10:49:22 +0000 (12:49 +0200)
committerDavid Monllaó <davidm@moodle.com>
Wed, 10 Apr 2019 10:49:22 +0000 (12:49 +0200)
1  2 
mod/lesson/locallib.php
mod/lesson/pagetypes/shortanswer.php

Simple merge
Simple merge