Merge branch 'mdl63321-master' of https://github.com/tlock/moodle
commitd1ae9c72c6e04bf493c1b75d3dd73ce97637375d
authorJun Pataleta <jun@moodle.com>
Wed, 12 Sep 2018 07:34:59 +0000 (12 15:34 +0800)
committerJun Pataleta <jun@moodle.com>
Wed, 12 Sep 2018 07:34:59 +0000 (12 15:34 +0800)
tree350f05506ad27738e5940a5ca8b59353ba488809
parent19d8da756119024f0952e6e4657f851c1e043f8a
parent9790093d1a6242b7f3053aebe83544aa81fe84e2
Merge branch 'mdl63321-master' of https://github.com/tlock/moodle