diff options
| author | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2021-08-12 00:30:27 +0200 |
| commit | c4133c43c7cfe2476ebfae87f9e4d10d96de9bc7 (patch) | |
| tree | 47bd773d2f434384b54e56916c1a287dd8e51511 /etc/git | |
| parent | ffa01e68859bb7a6daa9fcffdc8d77ca35db4bc0 (diff) | |
| parent | 4eb0a5146ae5a195a29c79f586fcc1e58f7fa69b (diff) | |
| download | guix-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 (limited to 'etc/git')
0 files changed, 0 insertions, 0 deletions