Merge branch 'MDL-62717-master' of https://github.com/lucaboesch/moodle
commit9d4c8d45ef5a687c5137eb78d3e6a964808d3647
authorDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:18:36 +0000 (25 12:18 +0200)
committerDavid Monllao <davidm@moodle.com>
Tue, 25 Sep 2018 10:18:36 +0000 (25 12:18 +0200)
tree232a515cefba0fb4a7078d772a8d8f1a76288d9f
parent85d4b77cd3ed9de54f7b3a83e239f8ae2720d895
parent490476a118b76976064f14c694685a8d23b28d6f
Merge branch 'MDL-62717-master' of https://github.com/lucaboesch/moodle