Merge branch 'MDL-62446-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2018 16:21:40 +0000 (18:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 12 Jun 2018 16:21:40 +0000 (18:21 +0200)
commitd0f9d0ef4def6ea99422b325a8744a63b15357d3
tree8a98583a6967b979b93b2ceb4379b6485541c38c
parent4a47a69519e136119f9f65461f83f41ebe6c5ee2
parent424441471d709abb581a660cb0b2fd70aa295eca
Merge branch 'MDL-62446-master' of git://github.com/lameze/moodle