Merge branch 'MDL-60949_master' of git://github.com/dmonllao/moodle
commit33b511bbc743753b421e906f1389fb27fdf6e55e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jul 2019 22:52:49 +0000 (9 00:52 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jul 2019 22:52:49 +0000 (9 00:52 +0200)
tree416527b72c213bf8062eca393b7acae1ed595804
parentcb153cfe8041d6595cf6433e3ae68b37fec57e7a
parent35b10d09ebc2f52870f5823ecf203d3b77da93d4
Merge branch 'MDL-60949_master' of git://github.com/dmonllao/moodle