Merge branch 'MDL-66935-lock-clashes-MOODLE_37_STABLE' of https://github.com/brendanh...
commit978ed33fb1b5bce69172231afdad0d2e4ca470af
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2019 08:03:46 +0000 (24 10:03 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2019 08:03:46 +0000 (24 10:03 +0200)
tree2812638caa86a06395c533d072867e4ed5b838f6
parent666d42019469973e08a9df6f43fa21d282632be5
parent413b3213442307070ace60cd9f9d3902f10377a3
Merge branch 'MDL-66935-lock-clashes-MOODLE_37_STABLE' of https://github.com/brendanheywood/moodle into MOODLE_37_STABLE