Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 09:05:05 +0000 (10:05 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 15 Jan 2018 09:05:05 +0000 (10:05 +0100)
commite3d292301ed9bce58bd3adf6a1ef222686a0abde
treec9fa7fb0440f4300cf10e65c7b2bccb501bbc8bf
parent5d89d24bea4c1f4734941766c0694f2b12d0002e
parentb6fdcd60713aa0f2eccde8e5753b015127f77dae
Merge branch 'MDL-55382-master' of git://github.com/damyon/moodle