Merge branch 'MDL-66935-lock-clashes' of https://github.com/brendanheywood/moodle
authorEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2019 07:59:19 +0000 (09:59 +0200)
committerEloy Lafuente (stronk7) <stronk7@moodle.org>
Thu, 24 Oct 2019 07:59:19 +0000 (09:59 +0200)
commit2ffdd72618e90a0d979ae4c4de88d6c5fa5f803b
tree2a4b0b293a0d26892b6fb2fd9f4ce03fadb4c239
parent4c4413922fb41b1ec257d6afd20964697f431af1
parent7e086935e372c7eab441e838958ca8729b6528be
Merge branch 'MDL-66935-lock-clashes' of https://github.com/brendanheywood/moodle