Merge branch 'MDL-53697-master' of git://github.com/abgreeve/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:36:44 +0000 (11:36 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Tue, 17 Jul 2018 03:36:44 +0000 (11:36 +0800)
1  2 
lib/moodlelib.php

Simple merge