Merge branch 'MDL-63522-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Oct 2018 23:00:12 +0000 (00:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 29 Oct 2018 23:00:12 +0000 (00:00 +0100)
commit038645591af0cc05a5f9ed9b849ef6a31ab33615
tree70502707e9dc45532fa3ecd11f162a038e5aba8b
parent82bd1fa00092b40548a474aa5b7b288d3f17f26c
parent1de51367f72b52a16ecaafd9c993fe59879335a1
Merge branch 'MDL-63522-master' of git://github.com/jleyva/moodle