Merge branch 'MDL-61257-master' of git://github.com/mihailges/moodle
authorJun Pataleta <jun@moodle.com>
Tue, 27 Mar 2018 04:59:16 +0000 (12:59 +0800)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:16:06 +0000 (18:16 +0200)
commit4683e5ff113e2675a8275b5aeaabe5873ac1dfdb
tree7d483d68912e11f115b62bc47c42d7fc5eb237a4
parentd6ccd918323db782c6907878e9d2feb2fc08f9ec
parente91bc73f872389b6118ea5b60fee75b7f625f105
Merge branch 'MDL-61257-master' of git://github.com/mihailges/moodle