Merge branch 'MDL-60003_master' of git://github.com/dmonllao/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 12:18:21 +0000 (20:18 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 2 Oct 2017 12:18:21 +0000 (20:18 +0800)
commit1a6aa52e0fbd14be70a8cdeda223742c3a6a2af6
treefb276d5c6ef19cbd46175d6cdd68f4ef7591d411
parent8463f6d579920f204125b8de72ee8f61e3a66a81
parentaa1b04dc81e1f7f0f924ddd1cb24d1dbaf9ed5d1
Merge branch 'MDL-60003_master' of git://github.com/dmonllao/moodle