Merge branch 'pr' from nix-soc
authorLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Fri, 8 Oct 2021 13:37:01 +0000 (14:37 +0100)
committerLuke Kenneth Casson Leighton <lkcl@lkcl.net>
Fri, 8 Oct 2021 13:37:01 +0000 (14:37 +0100)

Trivial merge