Merge branch 'MDL-61621_34' of git://github.com/dmonllao/moodle into MOODLE_34_STABLE
commit524312d1efe5b357c783524d9e8be334d4c1ce38
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 10:58:27 +0000 (18 12:58 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 10:58:27 +0000 (18 12:58 +0200)
tree422bb1c1c2b1c87523aa2b7fb497b8f61163f481
parent81bd6817b9b9432a4e7666db5aa18add776430f8
parent42770ce9a9ae51b6be56cf6a452c10b2f965d4a1
Merge branch 'MDL-61621_34' of git://github.com/dmonllao/moodle into MOODLE_34_STABLE