Merge branch 'MDL-60637-master' of git://github.com/lameze/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 21 Nov 2017 03:12:26 +0000 (16:12 +1300)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:30 +0000 (13:24 +0100)
commit6472ad5600ef7a02e7e30abe574846f68fad892e
tree935bc9d615926e131920ca397cdb2ecade415aa4
parentef4192b8e7392432d7f4d6922276e37c9b346b3d
parent486ecb1b897cf14cf7e713e1dc3f44f766bcbabc
Merge branch 'MDL-60637-master' of git://github.com/lameze/moodle