stockholm - take all the computers hostage, they'll love you!

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'lassul.us/master'	makefu	2018-11-10	5	-5/+13
\|\
\| *	l dns-stuff: sort	lassulus	2018-11-10	1	-4/+4
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2018-11-10	1	-0/+1
\| \|\
\| \| *	krebs: add youtube@eloop.org	tv	2018-11-10	1	-0/+1
\| * \|	l: add cache.krebsco.de & cache.lassul.us	lassulus	2018-11-10	1	-0/+2
\| \|/
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2018-11-10	1	-0/+6
\| \|\
\| \| *	krebs.tinc: add tincUpExtra	tv	2018-10-30	1	-0/+6
\| * \|	Merge remote-tracking branch 'nextgum/master'	lassulus	2018-11-10	5	-177/+140
\| \|\ \
\| * \| \|	realwallpaper: e056328 -> 847faeb	lassulus	2018-11-10	1	-2/+2
\| * \| \|	hotdog.r: remove import of gitlab-runner-shackspace	lassulus	2018-11-10	1	-1/+0
\| * \| \|	nixpkgs: 06fb025 -> bf7930d	lassulus	2018-11-05	1	-3/+3
* \| \| \|	ma: disable some host ci	makefu	2018-11-10	1	-10/+10
* \| \| \|	airdcpp module: after local-fs.target	makefu	2018-11-10	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	Merge remote-tracking branch 'lassul.us/master'	makefu	2018-11-05	6	-9/+121
\|\ \ \
\| * \| \|	nixpkgs: 06fb025 -> bf7930d	lassulus	2018-11-05	1	-3/+3
\| \|/ /
\| * \|	nixpkgs: 81f5c26 -> 06fb025	lassulus	2018-11-04	1	-3/+3
\| * \|	l: prism.r -> archprism.r, new prism.r	lassulus	2018-11-04	1	-1/+41
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-10-30	1	-1/+5
\| \|\\|
\| \| *	Merge remote-tracking branch 'prism/master'	tv	2018-10-27	26	-66/+391
\| \| \|\
\| \| * \|	git-preview: add GIT_PREVIEW_MERGE_STRATEGY	tv	2018-10-23	1	-1/+5
\| * \| \|	l: adopt kruck.r (palo)	lassulus	2018-10-30	1	-0/+29
\| \| \|/ \| \|/\|
\| * \|	nixpkgs: 21293d2 -> 81f5c26	lassulus	2018-10-18	1	-3/+3
\| * \|	l: add eve.r	lassulus	2018-10-11	1	-0/+38
\| * \|	Revert "remove nin"	lassulus	2018-10-09	2	-0/+112
\| * \|	force test in krops.nix	lassulus	2018-10-09	1	-0/+1
\| * \|	Reaktor: 0.6.1 -> 0.6.2	lassulus	2018-10-09	1	-2/+2
\| * \|	update-channel.sh: follow 18.09	lassulus	2018-10-08	1	-1/+1
\| * \|	nixpkgs: 862fb52 -> 21293d2	lassulus	2018-10-08	1	-4/+4
\| * \|	remove nin	lassulus	2018-10-08	2	-112/+0
\| * \|	krops: import from submodules	lassulus	2018-10-08	1	-4/+1
* \| \|	ma nextgum.r becomes gum.r	makefu	2018-11-05	1	-64/+28
* \| \|	remove nin	lassulus	2018-10-07	2	-112/+0
* \| \|	krops: import from submodules	lassulus	2018-10-07	1	-4/+1
* \| \|	add charybdis module until it's fixed in 18.09	lassulus	2018-10-07	3	-1/+112
\|/ /
* \|	repo-sync: remove deprecated isPy	lassulus	2018-10-07	1	-1/+0
* \|	Merge remote-tracking branch 'ni/master' into 18.09	lassulus	2018-10-07	8	-313/+38
\|\\|
\| *	tv: add 18.09 compatibility	tv	2018-10-07	7	-296/+38
\| *	hyphenation: RIP; nixpkgs is good enough	tv	2018-10-06	1	-17/+0
\| *	email-header: 0.3.0 -> 0.4.1-tv1	tv	2018-10-06	1	-4/+4
\| *	blessings: 1.1.0 -> 1.2.0	tv	2018-10-06	1	-2/+2
* \|	buildbot: use dateutil	lassulus	2018-10-07	1	-1/+1
* \|	nixpkgs: d16a7ab -> 6a3f5bc (18.09)	lassulus	2018-10-06	1	-3/+3
* \|	buildbot-stockholm: test krops	lassulus	2018-09-29	1	-0/+6
* \|	Merge remote-tracking branch 'enklave/master'	lassulus	2018-09-29	1	-37/+0
\|\ \
\| * \|	krebs: remove bln	jeschli	2018-09-25	1	-37/+0
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2018-09-29	14	-11/+333
\|\ \ \
\| * \| \|	Merge remote-tracking branch 'lass/master'	makefu	2018-09-26	13	-14/+30
\| \|\\| \|
\| * \| \|	ma default.nix: nextgum -> backup.makefu.r	makefu	2018-09-25	1	-0/+1
\| * \| \|	airdcpp.mod: add DownloadDirectory	makefu	2018-09-25	1	-0/+7
\| * \| \|	ma: move ssh pubkeys to files	makefu	2018-09-24	11	-11/+25