Merge branch 'master' into dont-use-sighup
commit364594cbf5d3d930d1bc332d8cced1f6579cf051
authorTheAssassin <theassassin@assassinate-you.net>
Tue, 8 Jan 2019 09:49:16 +0000 (8 10:49 +0100)
committerGitHub <noreply@github.com>
Tue, 8 Jan 2019 09:49:16 +0000 (8 10:49 +0100)
tree13fc5787e7e5ef1e936c82077486da8b4ec2c996
parent900283bbced9e33392c992112cb0361ff9113197
parent92ce16363bf302654433ea1b47e99bf9707fd2eb
Merge branch 'master' into dont-use-sighup