aboutsummaryrefslogtreecommitdiff
path: root/gnu/packages/gnu-pw-mgr.scm
diff options
context:
space:
mode:
Diffstat (limited to 'gnu/packages/gnu-pw-mgr.scm')
0 files changed, 0 insertions, 0 deletions
476ebfae87f9e4d10d96de9bc7&id2=4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b'>diff)downloadguix-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.tar.gz
guix-c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7.zip
Merge branch 'master' into core-updates-frozen
Conflicts: gnu/packages/algebra.scm gnu/packages/games.scm gnu/packages/golang.scm gnu/packages/kerberos.scm gnu/packages/mail.scm gnu/packages/python.scm gnu/packages/ruby.scm gnu/packages/scheme.scm gnu/packages/tex.scm gnu/packages/tls.scm gnu/packages/version-control.scm
Diffstat