Merge branch 'MDL-61863-master' of git://github.com/zig-moodle/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:31:26 +0000 (22:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:31:26 +0000 (22:31 +0200)
commit06f49a5eb25dfcac1a01303e23e74fb0e8a4f834
tree365479d7ea42e16f6c7589fa851d4463f9dfc507
parente6c1e22197f5104788bd4a6253e2edea7da4d71a
parent7d5667ee5782c4b45b55bf9c59b2337bae1dd542
Merge branch 'MDL-61863-master' of git://github.com/zig-moodle/moodle