Merge branch 'MDL-60796-master' of git://github.com/ankitagarwal/moodle
authorJake Dallimore <jake@moodle.com>
Tue, 21 Nov 2017 00:18:42 +0000 (08:18 +0800)
committerDavid Monllao <davidm@moodle.com>
Wed, 22 Nov 2017 12:24:30 +0000 (13:24 +0100)
commitef4192b8e7392432d7f4d6922276e37c9b346b3d
tree6e047d6286bda17fd76d9af97a1052690d6c4a37
parent8317549dffce39d4788ea4ffe1455f5547c1c76e
parent05ba0b957437740a17ec74e6a7d4dc096caa3e3c
Merge branch 'MDL-60796-master' of git://github.com/ankitagarwal/moodle