Merge branch 'MDL-62838' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:49:23 +0000 (00:49 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:49:23 +0000 (00:49 +0200)
commitc475c97b45fe77e4fc0b9f7dbf26085e3599eabd
treecee5317e62c47c6651611cf463a4f44af61d8047
parent7fb95a9d2d8462e61b43ae4232a8f102253dfc69
parent1146659db487f9b926f5b88003e1e149f92242a3
Merge branch 'MDL-62838' of git://github.com/timhunt/moodle