Merge branch 'wip-MDL-60594-master' of git://github.com/marinaglancy/moodle
commit2b7fda50d9c5b57b66bbdc3556c1358805e382e8
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 23:36:28 +0000 (19 00:36 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 18 Dec 2017 23:36:28 +0000 (19 00:36 +0100)
tree3360cdb6d239371056072925ade67dc0eefcf183
parenta1036e90f82672624700c5ce1b0568533ac9f044
parent8326cc5e3ec21f56bc5368fc5f7f531b2318006f
Merge branch 'wip-MDL-60594-master' of git://github.com/marinaglancy/moodle