Merge branch 'MDL-62783' of https://github.com/timhunt/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 22:25:33 +0000 (00:25 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 27 Jun 2018 22:25:33 +0000 (00:25 +0200)
commitd451152b7ef3af8fd9ee65c5bbc0c03ad7a767eb
treec2f93c61fcdf61d5384add904d365d662ea6071a
parent9d05da3f6d87911cd19be2882153a0c40dc04314
parentf4e18a0ae7da0af8ae26f2324a42ace3cbad4bea
Merge branch 'MDL-62783' of https://github.com/timhunt/moodle