Merge branch 'MDL-60414-master' of https://github.com/lucaboesch/moodle
authorJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 01:33:20 +0000 (09:33 +0800)
committerJun Pataleta <jun@moodle.com>
Thu, 3 May 2018 01:33:20 +0000 (09:33 +0800)
commitd16be43c051d4cee5268961d64bc157a9df07c52
tree27d5425865801893d505566d5d51284060c00167
parent27013d397cc0d5f6eb122b1e4e7a6f56229238d2
parent000355f223704fde68c9d9b9fe77dcf7af502a45
Merge branch 'MDL-60414-master' of https://github.com/lucaboesch/moodle