Merge branch 'MDL-68294-master' of git://github.com/jleyva/moodle
commit84ab8a51e21c9809845480bf17fc2ed41af3b78c
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 10:49:32 +0000 (18 12:49 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 10:49:32 +0000 (18 12:49 +0200)
treee40c440cea81e74c9af4bb4c3c9a6e044ac36fe5
parentda7feb34557a8a430ff80ffb58ef458b0be89fdb
parent8f2a40f2da1a693bf5120002be4e81f0b6a301f7
Merge branch 'MDL-68294-master' of git://github.com/jleyva/moodle