diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:24:37 -0400 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-09-27 14:27:28 -0400 |
commit | 3c6e220d8100281074c414a43c1efe9a01b53771 (patch) | |
tree | dc5d47fbbac3842d0da893adcd398dea10c1e681 /po | |
parent | 08473753a0ebafef22c0894d846e3b42fd6be2a2 (diff) | |
parent | 62048ff9fcfbe3fc790a7207fc5f6f3e0476a02a (diff) | |
download | guix-3c6e220d8100281074c414a43c1efe9a01b53771.tar.gz guix-3c6e220d8100281074c414a43c1efe9a01b53771.zip |
Merge branch 'master' into staging.
With resolved conflicts in:
gnu/local.mk
gnu/packages/crates-io.scm
Diffstat (limited to 'po')
-rw-r--r-- | po/guix/POTFILES.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/po/guix/POTFILES.in b/po/guix/POTFILES.in index c27bc74afc..4050a4c7ae 100644 --- a/po/guix/POTFILES.in +++ b/po/guix/POTFILES.in @@ -6,6 +6,7 @@ gnu/services.scm gnu/system.scm gnu/services/configuration.scm gnu/services/shepherd.scm +gnu/services/samba.scm gnu/home/services.scm gnu/home/services/ssh.scm gnu/home/services/symlink-manager.scm |