From: Mark Wooding Date: Fri, 20 Sep 2019 16:42:46 +0000 (+0100) Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/distorted-chroo... X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/distorted-chroot/commitdiff_plain/4de904fb31c2664ab6934f3828e43a8a044b11dd?hp=-c 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)'. --- 4de904fb31c2664ab6934f3828e43a8a044b11dd