Merge branch 'MDL-65257_master' of git://github.com/markn86/moodle
commit557c9679d9473f044902147f31521a021d1b9e4d
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Apr 2019 22:03:07 +0000 (30 00:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 30 Apr 2019 18:47:08 +0000 (30 20:47 +0200)
treef083595a4b3e348907b19f70d936db1ff1189e24
parent0686416663eff566bdd543f964e90c73b2da8a1c
parent5221be53da2883919203695e5a83f7d109408b13
Merge branch 'MDL-65257_master' of git://github.com/markn86/moodle