Merge branch 'master' into dont-use-sighup
commit900283bbced9e33392c992112cb0361ff9113197
authorTheAssassin <theassassin@assassinate-you.net>
Mon, 24 Dec 2018 22:19:39 +0000 (24 23:19 +0100)
committerGitHub <noreply@github.com>
Mon, 24 Dec 2018 22:19:39 +0000 (24 23:19 +0100)
tree879884a2e2e0e8c7ccf749ac5d8e677ba5bd2959
parent291fe0c9d959c51cd9d397ed88639476bca4f440
parent6baa36d0b1e0481aa36a36bb54140b81959b3874
Merge branch 'master' into dont-use-sighup