Merge branch 'MDL-63020' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 14:01:21 +0000 (16:01 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 14:01:21 +0000 (16:01 +0200)
commit985b6b75c295466d9b01794c6e6e5eb8bf151bcf
treee3e138df5bfecae4edfe310da8019854b32c8fb9
parentbac17316149b0051dd42724f06c428d1f0849495
parenteb6c769a8cdc206228cc79569b4f63917700cde6
Merge branch 'MDL-63020' of git://github.com/timhunt/moodle