Merge branch 'MDL-67722-master' of git://github.com/mickhawkins/moodle
commit14de86689728d5f6ba096735e23e5bba215ae06c
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 19:13:08 +0000 (28 20:13 +0100)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Tue, 28 Jan 2020 19:13:08 +0000 (28 20:13 +0100)
tree07d1a2789c25903f05c6d374218324c3d9b9d2e7
parentdae0a8c405d298ef9ba62d0060d7b77502d6ac80
parent66fa0c91ff1580612371f9c2ce7751f195967c42
Merge branch 'MDL-67722-master' of git://github.com/mickhawkins/moodle