Merge branch 'MDL-63698-master' of https://github.com/lucaboesch/moodle
commit95a4d796fe22045c05a92abb7879d5b101196407
authorDavid Monllao <davidm@moodle.com>
Mon, 29 Oct 2018 11:20:52 +0000 (29 12:20 +0100)
committerDavid Monllao <davidm@moodle.com>
Mon, 29 Oct 2018 11:20:52 +0000 (29 12:20 +0100)
tree2a0752a0d013439e6d951f993f971c0cee533e99
parent707668287d336f7e68570e2d4bff070f16f38844
parent9452bddedcbea4556090878e1e088b2928687016
Merge branch 'MDL-63698-master' of https://github.com/lucaboesch/moodle