Merge branch 'master' into option-docs-md

This commit is contained in:
pennae 2022-09-01 16:10:09 +02:00 committed by GitHub
commit 3bddcf5f90
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
727 changed files with 14747 additions and 11807 deletions

View file

@ -11,10 +11,6 @@ let
cfgFile = format.generate "00-default.conf" cfg.settings;
in
{
imports = [
(mkRenamedOptionModule [ "virtualisation" "cri-o" "registries" ] [ "virtualisation" "containers" "registries" "search" ])
];
meta = {
maintainers = teams.podman.members;
};