Merge branch 'MDL-60277_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 07:58:00 +0000 (15:58 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 07:58:00 +0000 (15:58 +0800)
commit8463f6d579920f204125b8de72ee8f61e3a66a81
tree81d22bd7350fc04d31b37a9c311cd79b3ec29e4f
parent86345473ec64e659b03f1912114f7c2a8304e36c
parent7c37e56fde34e842586fbf0873b90d9128474ba7
Merge branch 'MDL-60277_master' of git://github.com/dmonllao/moodle