Merge branch 'MDL-61796-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 13:20:19 +0000 (15:20 +0200)
committerDavid Monllao <davidm@moodle.com>
Wed, 18 Apr 2018 13:20:19 +0000 (15:20 +0200)
commitb5cca5ae5afb1791ec68c0c717684401b3d26588
treef5c0c28a294d4e566c8272401babec9268e23732
parentb1e5899c250db62c37f1af27d2c0b4c001cb046e
parent1c38b99cad5c3f64f59f107ae824e7277a55dd62
Merge branch 'MDL-61796-master' of https://github.com/lucaboesch/moodle