Merge branch 'MDL-62024-master' of git://github.com/bmbrands/moodle
authorDavid Monllao <davidm@moodle.com>
Thu, 26 Apr 2018 09:34:00 +0000 (11:34 +0200)
committerDavid Monllao <davidm@moodle.com>
Thu, 26 Apr 2018 09:34:00 +0000 (11:34 +0200)
commit258bf5c4e846d4f26b49c66cc922929d69a1302c
treed10e3fee2517e4765f15c7c1d2a83a06583615c8
parent46e7b6eecf3f6c72e7b645b695af6f96dd4e0af1
parentc706699a0edaeb86e542ac453c097da0ab5f0927
Merge branch 'MDL-62024-master' of git://github.com/bmbrands/moodle