Merge branch 'MDL-60771-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 05:03:49 +0000 (18:03 +1300)
committerJun Pataleta <jun@moodle.com>
Fri, 10 Nov 2017 05:03:49 +0000 (18:03 +1300)
commitcb04dcf4ce8cd253f4aa70d67cc37383deb01a2a
tree49c4dd3787d04bb0f72fe7047e0253c232e64d49
parentc3925187ed68964d6ebf7b15bf561ea458087e85
parentfbbcf45ef2d15f286659ebfb292ed1977e717d62
Merge branch 'MDL-60771-master' of git://github.com/lameze/moodle