Merge remote-tracking branch 'upstream/2020.12-rc' into notices
authorMichael <heluecht@pirati.ca>
Wed, 30 Dec 2020 07:12:59 +0000 (07:12 +0000)
committerMichael <heluecht@pirati.ca>
Wed, 30 Dec 2020 07:12:59 +0000 (07:12 +0000)
commit96e140a0278f41ea481802cbfd940a6ad6f5ebf5
tree7e74ee8c9a26b09a78b19052455277446020afca
parenta294c19d6e5a1ebd4d34009c9321ec43b155e98a
parentd41cb3f3e6de9e362339232877db511783fff006
Merge remote-tracking branch 'upstream/2020.12-rc' into notices