diff options
author | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
---|---|---|
committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
commit | 84157bb8bf2c610584e0836047da4c710f8eaf76 (patch) | |
tree | be5d8c7238e32802221db55a3ee83e7f6a58affb /tests/crate.scm | |
parent | fa63939acba69e11df44073a7eb687bd2ba48349 (diff) | |
parent | 03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 (diff) | |
download | guix-84157bb8bf2c610584e0836047da4c710f8eaf76.tar.gz |
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
Diffstat (limited to 'tests/crate.scm')
0 files changed, 0 insertions, 0 deletions