diff options
author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 10:07:35 -0500 |
---|---|---|
committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-01-17 11:47:09 -0500 |
commit | 276f40fdc349d2ad62582b23ea55e061b689cfc0 (patch) | |
tree | 8052d91aee78cf0d4317b41ec52134fde48fa5fb /gnu/tests/file-sharing.scm | |
parent | b2f6b6f6b9df6bcc24794238e7e97357470af95d (diff) | |
parent | 6ba510d76d6847065be725e958718002f3b13c7a (diff) | |
download | guix-patches-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar guix-patches-276f40fdc349d2ad62582b23ea55e061b689cfc0.tar.gz |
Merge branch 'version-1.4.0'
With resolved conflicts in:
gnu/packages/gnome.scm
gnu/packages/openstack.scm
gnu/packages/python-xyz.scm
Diffstat (limited to 'gnu/tests/file-sharing.scm')
0 files changed, 0 insertions, 0 deletions