Merge branch 'wip-MDL-62351-master' of git://github.com/marinaglancy/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 9 May 2018 13:11:06 +0000 (21:11 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 10 May 2018 01:17:28 +0000 (09:17 +0800)
commit06ede94f07d8737fde90e0960393abaf7a60ce0e
tree502e80280537b127a44aa303fa4d80ca4da6e804
parent1b764a2fdecd89af57a0fc519af2a7c9108f71ac
parent468c8d39c350e23b9bf17efc45e9a2ff66956699
Merge branch 'wip-MDL-62351-master' of git://github.com/marinaglancy/moodle