Merge branch 'MDL-61475-master-v3' of git://github.com/snake/moodle
commit4b183d225894292a432ea0af3943f11ec04551fb
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2018 10:00:57 +0000 (14 11:00 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 14 Mar 2018 10:00:57 +0000 (14 11:00 +0100)
treee6a59606ff114d6dfe1c936855f8d58e4386a156
parentb244de561221d82d1200648d37879fef34a72b65
parenta57960ee11ba6842741b1a4c15fef93c1329ee7e
Merge branch 'MDL-61475-master-v3' of git://github.com/snake/moodle