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)
commit506c93ac12aa4d52db5ba22a10676bb1dfd200f0
tree1bd45bf7147e39b7cf1426215393d8f2e53e3087
parentb39cc12b1d9767c7e150e243d3c6a2a496724e29
parentaef5a758e23151a6bbf335ea5f812271b6bc8235
Merge branch 'pr' from nix-soc