Merge branch 'MDL-61916-master' of git://github.com/cescobedo/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 03:17:08 +0000 (11:17 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Apr 2018 03:17:08 +0000 (11:17 +0800)
commitcabbda70b1322fdffe27966b2727d3b1c978d4ec
tree609ae4fc50e3eaca739c75dd5934d21b425ed6cd
parent9dabc4b96644353bb3f7ba1daf9044c06b78f6c4
parentbc346cc34df422f9dedfbe7e09091049b085dcfb
Merge branch 'MDL-61916-master' of git://github.com/cescobedo/moodle