diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-06-11 02:07:06 +0200 |
| commit | 5bace4c8ad981b66b5c0769b885d0bb0db91a029 (patch) | |
| tree | 0f2fb95c23d7990d26aeed71590bb94a3f2e17fe /gnu/tests.scm | |
| parent | 653569e878f39345b05110b998f10db3b520ccfe (diff) | |
| parent | 20d87dfb453cf27f95c5ef3858e8d096278e1702 (diff) | |
| download | guix-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar guix-5bace4c8ad981b66b5c0769b885d0bb0db91a029.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
* gnu/packages/tls.scm (gnutls): Incorporated 3.5.13 graft (88e2511e217f2).
Diffstat (limited to 'gnu/tests.scm')
0 files changed, 0 insertions, 0 deletions