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)

Trivial merge