Merge branch 'MDL-68379-master' of git://github.com/ferranrecio/moodle
commita58e8cb0a154e6c9cff53cad89e70871babebf6c
authorSara Arjona <sara@moodle.com>
Mon, 4 May 2020 18:02:06 +0000 (4 20:02 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 4 May 2020 18:02:06 +0000 (4 20:02 +0200)
treecba3d35b3ceec91778cd13d1afdae3651bde00a0
parentda2f9f651069cfada67a84b4565852dfb29e6cab
parent72a2335151ae9cd4ca3e8c13bc1d6959ae2a5de5
Merge branch 'MDL-68379-master' of git://github.com/ferranrecio/moodle