Merge branch 'MDL-61166-master' of git://github.com/rezaies/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 09:57:38 +0000 (10:57 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 15 Jan 2018 09:57:38 +0000 (10:57 +0100)
commitc1dd6af98adb7493784f7318562cf26d0709918c
treec8162ddb63a5df47257c7c655bb27a4651d440b7
parente3d292301ed9bce58bd3adf6a1ef222686a0abde
parente4d3ed18ff429b87a81bb188008dc4e537e37e2f
Merge branch 'MDL-61166-master' of git://github.com/rezaies/moodle