Merge branch 'MDL-61863-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE
commitbd087739c6cee6c802f07859a19b0aff7ac39b4f
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:31:49 +0000 (26 22:31 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 26 Apr 2018 20:31:49 +0000 (26 22:31 +0200)
treecbb2acd6e07a2612f7f2ce5e7a6dc4bca0ed3044
parent28a7c5b677424f91d39aac8981efc72aa2bc1097
parent376212f1b984d17e7237b4595dad7642bff5db99
Merge branch 'MDL-61863-34' of git://github.com/zig-moodle/moodle into MOODLE_34_STABLE