Merge branch 'MDL-62383-master' of git://github.com/junpataleta/moodle
commit84bc2245f7b5903e1ee7f0cb01efd8c61e00476f
authorJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 02:03:32 +0000 (10 10:03 +0800)
committerJake Dallimore <jake@moodle.com>
Thu, 10 May 2018 02:03:32 +0000 (10 10:03 +0800)
treed0cea0b69b16748433713f67f8edc082d51a6efe
parentdfa16c06a65510aeb53b02b22443b3370cc8037d
parent6c0c9d5d086f919b8678c72360a5a8343887aa30
Merge branch 'MDL-62383-master' of git://github.com/junpataleta/moodle