Merge branch 'MDL-62070-master' of git://github.com/bmbrands/moodle
commite754bce39924179a3cbd5c094e3cf8eeaf7e71e9
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:13:47 +0000 (26 22:13 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:13:47 +0000 (26 22:13 +0200)
tree6855c6ad39f04cd8c64497b7123eaf45f5b5f77f
parentbb874345cfcb9c96ff9817a7801ba809b8a24cc3
parent5f29d191d976be4226479c1880e242c414dbc79f
Merge branch 'MDL-62070-master' of git://github.com/bmbrands/moodle