Merge branch 'MDL-59248-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 10:35:59 +0000 (12:35 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 3 Oct 2017 10:35:59 +0000 (12:35 +0200)
commitd2800e59288a164695c4fe23bb279f57355d569a
treedca81138e028116f503d07202d53c0dcbd6334ec
parent086d592d4319b8def68eb106a79e9b3522df6e05
parent46f5e9a0ef16260150942148285c8e972df29d57
Merge branch 'MDL-59248-master' of git://github.com/jleyva/moodle