Merge branch 'MDL-61312-master' of git://github.com/jleyva/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2018 23:47:44 +0000 (00:47 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 6 Mar 2018 23:47:44 +0000 (00:47 +0100)
commite975671ca3523fb66d117633191aa21defdc6928
treedde36da88a85c5b1d18c7471f10d81d31343308a
parente28b586b9cdf377598c55696c07e606649b623d4
parent0e8b3d929d1610b3352cf00615849317efd4c9bc
Merge branch 'MDL-61312-master' of git://github.com/jleyva/moodle