Merge branch 'MDL-61801-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 09:02:34 +0000 (11:02 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 2 Apr 2018 09:04:49 +0000 (11:04 +0200)
commit64a14f15bc22844d9ec6ae30156b06e93ba2cd41
tree35d872de24960873895cc633fb44337b43da8c3c
parent1690a76e6259f12f564f655c0f12c20afe4021f6
parent214b9e89d6c0525864bfe9e70093c3f149d56ffb
Merge branch 'MDL-61801-master' of git://github.com/andrewnicols/moodle