Merge branch 'wip-MDL-61759-master' of https://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Apr 2018 10:31:04 +0000 (18:31 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 23 Apr 2018 10:31:04 +0000 (18:31 +0800)
commitbe056e1b286781748585ca8f513d0490ad26f512
treeca2384b6b9d8129412aedf171c804fb7c304b72c
parent8fbff1d453bd90a6a14065d26123f495a721357c
parenta74c511e7fa717c90b263fc9a83186dd6c178ae8
Merge branch 'wip-MDL-61759-master' of https://github.com/marinaglancy/moodle