Merge branch 'wip-MDL-64404-master' of https://github.com/Beedell/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2019 00:28:54 +0000 (01:28 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 5 Feb 2019 00:28:54 +0000 (01:28 +0100)
commit89b1f3ac954a154838924afba417841dbdc85403
tree88a98b1fc8055e25d9a5a6d18cd40e76541cdc88
parent77017d1138beaf9c93b59756c1bbc358df9e35f8
parent410a088a91530be9a22115a6047edc7461169c8e
Merge branch 'wip-MDL-64404-master' of https://github.com/Beedell/moodle