Merge branch 'MDL-47456-avoid-siteid-db' of https://github.com/brendanheywood/moodle
authorAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Nov 2020 00:51:57 +0000 (08:51 +0800)
committerAndrew Nicols <andrew@nicols.co.uk>
Thu, 19 Nov 2020 00:51:57 +0000 (08:51 +0800)

Trivial merge