Jan Tojnar 2da5ce4ab3 Merge branch 'staging-next' into staging ...

; Conflicts:
;	pkgs/development/python-modules/fakeredis/default.nix

2022-01-28 14:05:11 +01:00

..

manual

Merge branch 'staging-next' into staging

2022-01-28 14:05:11 +01:00

varlistentry-fixer.rb

…

xmlformat.conf

…