Merge branch 'MDL-67296-master' of git://github.com/vmdef/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jan 2020 22:46:06 +0000 (23:46 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 22 Jan 2020 22:46:06 +0000 (23:46 +0100)
commitcb701f77b4428c872f750570a3007f5efdbcf6b4
treea3ce0cc3f81c4f7a8a9e1e4ff6bff8b0341175e2
parent1e38b94c8ecb77e2ba67143c1f15f33f3aa3448b
parente942844d769d17994a3026d8f6f21da6cf6d4b53
Merge branch 'MDL-67296-master' of git://github.com/vmdef/moodle