Merge branch 'MDL-65335_master' of https://github.com/marxjohnson/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 21:21:51 +0000 (23:21 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 1 Oct 2019 21:21:51 +0000 (23:21 +0200)
commit7dbc1041b3fe94cb200eb9d54d7f076086072f62
tree76668706a8cae04361d639a289d8ad2cc7c26c6e
parentba9110e1c8a987a9643a96d068510ccde935a3b9
parentf3c9599e1fbf3e730c229ce93909000d5e6304cd
Merge branch 'MDL-65335_master' of https://github.com/marxjohnson/moodle