Merge branch 'MDL-56688-master' of https://github.com/nwp90/moodle
authorDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:32:38 +0000 (09:32 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 12 Feb 2018 08:32:38 +0000 (09:32 +0100)
commit755310cbebb65618df2c862a84ca63398e01b3a5
tree1ea5faaa1948d2d105a81bcb0a141aa1eb03be82
parentf40d707dbfd7589bd32ad52b678c96f0cd50b63a
parent28437460d2c1a933391e2a7845b5a3fa04800c86
Merge branch 'MDL-56688-master' of https://github.com/nwp90/moodle