Merge branch 'MDL-52832-master' of https://github.com/lucaboesch/moodle
authorDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 11:18:27 +0000 (12:18 +0100)
committerDavid Monllao <davidm@moodle.com>
Tue, 6 Feb 2018 11:18:27 +0000 (12:18 +0100)
commit7416d00ad28aee9684a47dfa5fa4c39b5d2e10a1
tree7d1f2290915697215a3c0ef433a53a49becba15d
parent24d8485ea6a8fc94550af6b1e0cb950ebe51543d
parentbcf4a7f0764764816ec11f85d283fbab2c75ba69
Merge branch 'MDL-52832-master' of https://github.com/lucaboesch/moodle