Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 06:03:47 +0000 (14:03 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Mon, 18 Dec 2017 06:03:47 +0000 (14:03 +0800)
commit6cb535f081533706d17143c60a6c2a3cfe66154e
tree753b5b5b80640c31860f037ab0094ba352f1999b
parentdcb623be71c45c99736ccd875dbf6914ce7d22db
parentcadeb8d21cd6b5c4c59128b28cedacfa01770246
Merge branch 'MDL-60061-master' of git://github.com/lameze/moodle