Merge branch 'wip-MDL-59881-master' of git://github.com/abgreeve/moodle
commit2f8420657eec5a075e50fc69d259c788d5383fdf
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 22:55:58 +0000 (25 00:55 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Aug 2017 22:55:58 +0000 (25 00:55 +0200)
tree7683b7ae1507866ed755ba10a04e2eac891d954b
parent9eb3c173ae80fd2e6e96d2bff54211401e52c2e3
parente3909e58533d906c8995f62887968979ace91546
Merge branch 'wip-MDL-59881-master' of git://github.com/abgreeve/moodle