Merge branch 'MDL-55153-master' of git://github.com/sarjona/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Mar 2018 22:25:23 +0000 (23:25 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 5 Mar 2018 22:25:23 +0000 (23:25 +0100)
commit6d3f2f9036b0ad0de7594c844871869b4ea2e3a7
tree296e70a228530d7aa66fadb7a883b04494651165
parent56a71777416b98a6a77b7b0d6f784e44d180a900
parentefa66e0597137e9514d74b2c8a30e2a85c8c1bc4
Merge branch 'MDL-55153-master' of git://github.com/sarjona/moodle