Merge branch 'master_MDL-59857' of https://github.com/danmarsden/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 01:06:56 +0000 (03:06 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Wed, 18 Apr 2018 01:06:56 +0000 (03:06 +0200)
commit45fc6559b49c94f486d2087793e3524f640a4525
tree8ae0a796bd75fb04a61a5ef0c83de362c742308e
parent6d4bc5bd34809683e2e2ada3ce52a3e0adf94de1
parent679eab046fec9396d1a76b71b8cde331675b7a4a
Merge branch 'master_MDL-59857' of https://github.com/danmarsden/moodle