Merge branch 'MDL-61063-master' of https://github.com/sammarshallou/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:02:08 +0000 (22:02 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 21:02:08 +0000 (22:02 +0100)
commitd7ba45290b941237f24408dfb7f5f00512566e26
treeede41561cfb5f2eb67b9e6252a5c568a11b460ba
parentb3b79085e61847d05bbb5c60d03ff483029664d2
parent470d59d31f5d277de799875308b20922890dfb7a
Merge branch 'MDL-61063-master' of https://github.com/sammarshallou/moodle