Jan Tojnar 457f28f6f8 Merge branch 'master' into staging-next ... ; Conflicts: ; pkgs/development/tools/codespell/default.nix codespell 2.2.2 switched to pyproject & setuptools_scm: https://github.com/codespell-project/codespell/pull/2523		2022-10-19 05:24:28 +02:00
..
default.nix	Merge branch 'master' into staging-next	2022-10-19 05:24:28 +02:00
mix.nix	pleroma: 2.4.3 -> 2.4.4 (#196625)	2022-10-18 21:57:54 +02:00