diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-01 19:05:29 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-01 19:05:29 -0500 |
| commit | 3820d3973982048e5b93ad08d619c893bc50de14 (patch) | |
| tree | 159a3ea785647fb8bb5e4b754f5c0f98d86e29d5 /guix | |
| parent | 751be9a056114d353bac12510bea33e8d5577f49 (diff) | |
| parent | afff9058a0a9a3f3d633f563bb8a1a7d9e503165 (diff) | |
| download | gnu-guix-3820d3973982048e5b93ad08d619c893bc50de14.tar gnu-guix-3820d3973982048e5b93ad08d619c893bc50de14.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/gnupg.scm
Diffstat (limited to 'guix')
0 files changed, 0 insertions, 0 deletions