Merge branch 'MDL-63456-master' of git://github.com/merrill-oakland/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 22:15:46 +0000 (00:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Oct 2018 22:15:46 +0000 (00:15 +0200)
commitd9446c0ff75e80d4681567789fd052f3f3803522
treea9f9afa7e6280ffad4cfb509f557bc09e24aa952
parentbbfda3b9dbc5c9d8343eb02e944fabcef20b3f26
parent1ddf3b6a0f358db56c5e165367b1182149425ec6
Merge branch 'MDL-63456-master' of git://github.com/merrill-oakland/moodle