Merge branch 'MDL-63329-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 08:19:19 +0000 (10:19 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 12 Sep 2018 08:19:19 +0000 (10:19 +0200)
commit79e2d710d3a5d468570d65a8445c218797744048
treebefbb393302452ee203bba7c3bdc9b0c9d41d768
parentd1ae9c72c6e04bf493c1b75d3dd73ce97637375d
parent89aff0d82898e5757de6b7ae96a5d81b164d32fc
Merge branch 'MDL-63329-master' of git://github.com/andrewnicols/moodle