Merge branch 'master_MDL-60421' of https://github.com/danmarsden/moodle
commit24d8485ea6a8fc94550af6b1e0cb950ebe51543d
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 09:46:35 +0000 (6 10:46 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 09:46:35 +0000 (6 10:46 +0100)
tree6f827bdd8851506b2dfedba4988b84b18d2a8174
parent8c52eb2a152eff8375424447f1232cd147e13e48
parent3e080111f9172e3eb318e9308fdb4af901531d11
Merge branch 'master_MDL-60421' of https://github.com/danmarsden/moodle