Merge branch 'MDL-61393-master' of git://github.com/lameze/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Feb 2018 22:06:36 +0000 (23:06 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Feb 2018 22:06:36 +0000 (23:06 +0100)
commitb62139ab27d80b49d3286bbf416c74f69ee5d40e
tree9712632f5480926731ceb896ce894abb18e37c42
parentde18c36f9f3c90ade0ffc0abafe65ff6386c6d02
parent1421bf5492099a17ef33f695dd19c84b5fa0c486
Merge branch 'MDL-61393-master' of git://github.com/lameze/moodle