Merge branch 'MDL-61691-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Mon, 26 Mar 2018 21:15:11 +0000 (23:15 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 28 Mar 2018 16:12:45 +0000 (18:12 +0200)
commit0b9162bd0594e9e57bffe0173dd7ce569b9af07c
tree3e03e8d4c7f9af08ca710e2f80fcda099367513a
parent306a0bafed1c69dfbe568ef1a79aacdb99594243
parente315e84cf2531995c4d65e92416878690f4d46f1
Merge branch 'MDL-61691-master' of https://github.com/snake/moodle