Merge branch 'MDL-61979-master' of git://github.com/zig-moodle/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:44:16 +0000 (02:44 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 00:44:16 +0000 (02:44 +0200)
commit1b4983fc90353ec360a99b2a42a9870411fdc982
tree3823fe74c06559d6e2175f94b9acdcad6980ffa7
parent7bff0ee145748eb91252620809a92a9c47dea1db
parentbcc08d3b5e6921dbf688b8fa54d1a2d8962bdc0e
Merge branch 'MDL-61979-master' of git://github.com/zig-moodle/moodle