Merge branch 'MDL-63396-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Oct 2018 22:35:31 +0000 (23:35 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Oct 2018 22:35:31 +0000 (23:35 +0100)
commit82bd1fa00092b40548a474aa5b7b288d3f17f26c
tree268721124bc6844853ee278c7ddad1874d8a410f
parent77ac4d8c319d066006f8c17fdb11e0b10e6adef2
parent2ced73f636987de9db76bc066a127631d623d238
Merge branch 'MDL-63396-master' of git://github.com/jleyva/moodle