Merge branch 'MDL-64173-master' of git://github.com/bmbrands/moodle
commitbb63b48bcb2912ae134849d7885745edf0c60726
authorDavid Monllao <davidm@moodle.com>
Mon, 26 Nov 2018 04:36:57 +0000 (26 05:36 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 26 Nov 2018 04:36:57 +0000 (26 05:36 +0100)
tree01cb5f94f774f7310e4e36110a657e944fc99bcd
parent4bcdf02c5f49790204f33249410a2d0cc38b4a6b
parent02383d7119d6eb66e8791b6ccf7e81e27f9094ca
Merge branch 'MDL-64173-master' of git://github.com/bmbrands/moodle