Merge branch 'MDL-66120-36' of git://github.com/peterRd/moodle into MOODLE_36_STABLE
commited903633b30dbcf1401adcdbb10a283ec52bf7cf
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2019 10:12:47 +0000 (3 12:12 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Sep 2019 10:12:47 +0000 (3 12:12 +0200)
tree146d7a2a3c12bccd503f9ed28bb72df9d4136a90
parenta029dfbc5bcba787585f2bad05fec08415525bad
parentefe8b111866421398d4caff4bcec7215a82c722b
Merge branch 'MDL-66120-36' of git://github.com/peterRd/moodle into MOODLE_36_STABLE