chiark / gitweb /
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/distorted-chroo...
authorMark Wooding <mdw@distorted.org.uk>
Fri, 20 Sep 2019 16:42:46 +0000 (17:42 +0100)
committerMark Wooding <mdw@distorted.org.uk>
Fri, 20 Sep 2019 16:42:46 +0000 (17:42 +0100)
commit4de904fb31c2664ab6934f3828e43a8a044b11dd
treec2ecc2c1ef4f6e15424a16a32cc54d0007ea8077
parent78c7d2551e71d61c3f036173d3491b5ea80928ba
parent4d529157c24de55bda6fa53ddaf85edd9ed87327
Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/distorted-chroot into deploy

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/distorted-chroot:
  Makefile: Don't commit to `PROXY' before we know `$(APTCONF)'.