Merge branch 'MDL_56093' of https://github.com/eledia/moodle
commit33d2796f0a365fd401d3de57d4613035277fc38c
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 04:13:58 +0000 (9 12:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 9 Jul 2018 04:13:58 +0000 (9 12:13 +0800)
treef46b0d4f788f031d75026ee56f224ba193d2c9a9
parent545a1382aa9174c8473af3da486cb931c614a0d2
parentc19ef03f719ca4b381ef3d9a5c34aafe0910d17d
Merge branch 'MDL_56093' of https://github.com/eledia/moodle