Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 18:56:24 +0000 (19:56 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 8 Jan 2018 18:56:24 +0000 (19:56 +0100)
commitd8ef541bbca455bb745e9a2088ee3c6e2ca7ec46
treefdda25f400d0e9411307fdaf8df177aaf03a066c
parent1b9fcbf7a723094bf11f3d461da2cd162909d1c3
parent098f4337d287eef0a5e44054c9f216e0b05f6150
Merge branch 'MDL-61068-master' of git://github.com/andrewnicols/moodle