Merge branch 'MDL-62430_master' of git://github.com/dmonllao/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 00:56:00 +0000 (02:56 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 15 May 2018 00:56:00 +0000 (02:56 +0200)
commit05c87e7bb45e5fdb0e8e0aca7bf0f4a073455393
tree2fab764cf2e4206a404059f169f9272498565254
parent014335fb2b2baded398d4421cff554362c5734f4
parent641d878d082af9677849c12e6d02ee9aaf65b9f1
Merge branch 'MDL-62430_master' of git://github.com/dmonllao/moodle