Merge branch 'MDL-62730-master' of https://github.com/snake/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 00:53:42 +0000 (02:53 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 26 Jun 2018 00:53:42 +0000 (02:53 +0200)
commitcb6ba9b1be6bee61ec95454bccf4e1695bbe19a6
treeec46fbd8357dfb6a2529d64dfa355d329049a871
parent8e059bc39f8450b0e11b476c63b24ba4050e3198
parent548c260d822a2ac63b0274db586e8645645c804b
Merge branch 'MDL-62730-master' of https://github.com/snake/moodle