Merge branch 'MDL-62026-master' of git://github.com/junpataleta/moodle
commit124cd929fb3ae34541c06d4d11107d7494f1780c
authorAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Jul 2018 00:13:11 +0000 (11 08:13 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Wed, 11 Jul 2018 00:13:11 +0000 (11 08:13 +0800)
tree4e8ce0eb06bc540c795fa57cf02424aeefa88a14
parent76dbb5884d9eb3d6a9c06f3ed103739003dbf6dc
parent0433707f7bfc20819a6c24f345cf7e25247c8da5
Merge branch 'MDL-62026-master' of git://github.com/junpataleta/moodle