Merge branch 'wip-MDL-61876-master-fix' of https://github.com/marinaglancy/moodle
commitfcb7459569d2f06d6d440ad175e840e4d9badebc
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 May 2018 10:11:16 +0000 (4 12:11 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 4 May 2018 10:11:16 +0000 (4 12:11 +0200)
tree70e2f8d0a20643d16a471ecbf4af5150f8368bc7
parent9967731256a2cffe4403fb9882b5d1a53c21e4d7
parent75290313680125d0f8e1264f004016778d0a14b4
Merge branch 'wip-MDL-61876-master-fix' of https://github.com/marinaglancy/moodle