Merge branch 'MDL-45367-master' of https://github.com/lucaboesch/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 00:34:32 +0000 (08:34 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 22 Jan 2018 00:34:32 +0000 (08:34 +0800)
commita9a67db2c96fd8d7623b7a2a376c6e5619a34487
treeb87679cf4750dd293de5ae7cdbc55002ecd6e8bd
parent66915b0ea16d030fb872d98665eb4c5dd3960703
parent7583efe9f529431d55528dbb5bc822372403e1fc
Merge branch 'MDL-45367-master' of https://github.com/lucaboesch/moodle