Merge branch 'MDL-63020_35' of git://github.com/timhunt/moodle into MOODLE_35_STABLE
commitd82567eb7fb736200111ced0b44612cf7407e79e
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 15:40:10 +0000 (24 17:40 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 24 Sep 2018 15:40:10 +0000 (24 17:40 +0200)
tree3e8ae92037f7c1912fef7d70a352a11c1a775f7b
parent02a31d5f966c09404b8d51652bd98ca61d300955
parentade905e24822ef035bb5ee12b6d8aca8c43e70eb
Merge branch 'MDL-63020_35' of git://github.com/timhunt/moodle into MOODLE_35_STABLE