Merge branch 'MDL-62834' of git://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:46:33 +0000 (00:46 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Jul 2018 22:46:33 +0000 (00:46 +0200)
commit7fb95a9d2d8462e61b43ae4232a8f102253dfc69
tree011bc50dc00cb84e93f78db02c8679f4a5499474
parentaf0202c5c2ac6ab3278c53468762276bd18df594
parent8aedf6d478e5451e6674dced3f81dc75daeeda60
Merge branch 'MDL-62834' of git://github.com/timhunt/moodle