Merge branch 'MDL-61204-master' of git://github.com/andrewnicols/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 01:16:40 +0000 (02:16 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 16 Jan 2018 01:16:40 +0000 (02:16 +0100)
commit5242a76a4b25dcbc4f73fe33ae7f7cf98cc46868
treef6df71f7c18bc14138267ea3c650cac15e6059a2
parent3e9282d486e00dd43b5ad41b3d87c611e8307fbf
parent4b559824466e2ddbccb277fc3e70197addeaca2d
Merge branch 'MDL-61204-master' of git://github.com/andrewnicols/moodle