summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristopher Baines <christopher.baines@digital.cabinet-office.gov.uk>2018-12-31 10:59:20 +0000
committerChristopher Baines <christopher.baines@digital.cabinet-office.gov.uk>2018-12-31 10:59:20 +0000
commit10b8d43d8b0f816581be1dbe9a9bfd04ea30550e (patch)
tree313b79df6df2f42fdd96fbfc82c6c80dc718cbf6
parent06248b6c41d4f6cd3346d1f91f570b49b05b7ccd (diff)
parent32e7cbcd12bd2c52633a7c96e349c280b77ef9c7 (diff)
parent46f81c41a26f450ddf502de6140cdb78468ad588 (diff)
parent63a8908bd262d811e7820417f7b79a3e160f6132 (diff)
parentbf642747f460160bb6db4031d7190834949f5abb (diff)
downloadgnu-guix-10b8d43d8b0f816581be1dbe9a9bfd04ea30550e.tar
gnu-guix-10b8d43d8b0f816581be1dbe9a9bfd04ea30550e.tar.gz
Merge remote-tracking branches 'cbaines/wip-rails-extra-packages-updated', 'cbaines/coala', 'cbaines/terraform', 'origin/release' and 'cbaines/workaround-cloudfoundry-tar-unpacking-issue' into guix-for-govuk-mini-environment-admin-new