Merge branch 'MDL-42764_master' of git://github.com/markn86/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:18:34 +0000 (11:18 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 5 Feb 2018 10:18:34 +0000 (11:18 +0100)
commit1cc79637c7413f65d80e10ba4fff86c70146eb7e
treea45ac92d2bde456296810f3539a4671cf5e1a57f
parentad1ba7f02a8fa47a0a826331bab78caaa4bd963e
parentb02295039ec1bd278d2d0c97cfb27d4f475dffd4
Merge branch 'MDL-42764_master' of git://github.com/markn86/moodle