Merge branch 'MDL-42638-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Nov 2019 21:32:56 +0000 (22:32 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 6 Nov 2019 21:32:56 +0000 (22:32 +0100)
commitd6c704bf8eb92357dfb85a96d0603dc0f65b8261
tree51c0492bb43f2fc0a1b2ec3cf4036d6c1d4fdc18
parentc1f5154a100cc4f07f2fb06de99dff869eaad7d2
parentc8f78f71066c16c2364b0f46a971141dad3c9b69
Merge branch 'MDL-42638-master' of https://github.com/lucaboesch/moodle