Merge branch 'wip-MDL-61242-master' of git://github.com/abgreeve/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 00:41:06 +0000 (01:41 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Jan 2018 00:41:06 +0000 (01:41 +0100)
commit94eeb7cbdb4573b09d0e580c68e174fec334dbd4
tree8bab8b261d8cd075be740732f77458857def2863
parent9e82cab6b60e56710a8d834d3a2ec8766d80190c
parentd05c2ac7cc7859b6999d71bee8d68f89cdcd0822
Merge branch 'wip-MDL-61242-master' of git://github.com/abgreeve/moodle