Merge branch 'wip-MDL-60033-master' of git://github.com/marinaglancy/moodle
authorJake Dallimore <jake@moodle.com>
Mon, 16 Oct 2017 07:36:29 +0000 (15:36 +0800)
committerJake Dallimore <jake@moodle.com>
Mon, 16 Oct 2017 07:36:29 +0000 (15:36 +0800)
commit1841d169c84f2ee95e1b31eb97e94559a10748d5
tree44ee2e88401d931bfb5f9ba9d9ae12735b51dae7
parentbcecb89976d4ca3d0c4704b28441549ecaa37257
parent7814ae503b37c36346f39288879c389b117f5ad9
Merge branch 'wip-MDL-60033-master' of git://github.com/marinaglancy/moodle