Merge branch 'MDL-62747' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 22:30:38 +0000 (00:30 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 22:30:38 +0000 (00:30 +0200)
commit8f6320201463392044a9305280ada69b85020e0b
tree78d321d9807e8454e642b4b6991cbd54288553be
parentd451152b7ef3af8fd9ee65c5bbc0c03ad7a767eb
parenta1bc8928cc2c57a84ddce15910c60ba7cba51631
Merge branch 'MDL-62747' of https://github.com/timhunt/moodle