Merge branch 'MDL-67004-master' of git://github.com/dpalou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Oct 2019 17:50:38 +0000 (19:50 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 23 Oct 2019 17:50:38 +0000 (19:50 +0200)
commit2a724095bd63ce0a8e219e416d1f73aeff484bd4
tree0f2c3c86fb475189f1e0f150ffd58b7e97ade13b
parentd020e1b779b36a8480bf8e73f050518cc2323d5a
parent187b11f40d704efc38c23681fb410b37453dfdcc
Merge branch 'MDL-67004-master' of git://github.com/dpalou/moodle