Merge branch 'MDL-60079-master' of https://github.com/nashtechdev01/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 07:09:15 +0000 (08:09 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 9 Jan 2018 07:09:15 +0000 (08:09 +0100)
commit1679485693320f201b845095630a5b00a3579c3e
treeadc941137ca106c77e24d4a09fe699c00d3e1dc0
parenta52fc1f7a837bc416b37e04c04ad50df4a0cddbc
parent48a9fd89e0a4382a1c747013da18825423df3aeb
Merge branch 'MDL-60079-master' of https://github.com/nashtechdev01/moodle