Merge branch 'MDL-61991-master' of https://github.com/lucaboesch/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:22:20 +0000 (02:22 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Fri, 20 Apr 2018 00:22:20 +0000 (02:22 +0200)
commit85176022e859d8ca0dc2a4f07ffbb11b6a968b70
tree0ec28b178a2e37b3a8bd687677e7ca29883d5e3d
parent00743c0929b6502ba7537b37d662e5757498bedc
parentf0aef7abfee4526526ce114ea2feeaa71035b64e
Merge branch 'MDL-61991-master' of https://github.com/lucaboesch/moodle