Merge branch 'wip-MDL-61876-fix' of https://github.com/marinaglancy/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 17:15:28 +0000 (19:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 7 May 2018 17:15:28 +0000 (19:15 +0200)
commitd0ce3439fe671bd67d465fa5c48e1af98376025c
treeacbb39c3c409e99622cd482a13afc2fddd4281e6
parent775db1409ed0c2f85b9d324e7c4b0fa8cf0fd1ee
parent8852faea9138f5e2a483d6b9983e5847b1742383
Merge branch 'wip-MDL-61876-fix' of https://github.com/marinaglancy/moodle