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

	Commit message (Expand)	Author	Age	Files	Lines
*	l 3 fetchWallpaper -> k 3 fetchWallpaper	lassulus	2015-12-12	2	-0/+90
*	Merge branch 'master' of pnp:stockholm	makefu	2015-12-04	12	-9/+40
\|\
\| *	m 1 gum: provides mattermost via docker container	makefu	2015-11-27	1	-0/+2
\| *	k 5 cacpanel: bump version	makefu	2015-11-27	1	-2/+2
\| *	k 5 drivedroid-gen-repo: bump version	makefu	2015-11-25	1	-2/+2
\| *	k 5: cacpy -> cacpanel	makefu	2015-11-23	2	-20/+18
\| *	Merge remote-tracking branch 'cloudkrebs/master'	makefu	2015-11-22	1	-1/+1
\| \|\
\| \| *	Merge remote-tracking branch 'pnp/master'	lassulus	2015-11-21	8	-8/+216
\| \| \|\
\| \| * \	Merge remote-tracking branch 'cd/master'	lassulus	2015-11-21	7	-6/+7
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'cd/master'	lassulus	2015-11-17	3	-0/+50
\| \| \|\ \ \
\| \| * \| \| \|	k 3 l: bump echelon internet addr	lassulus	2015-11-14	1	-1/+1
\| * \| \| \| \|	Merge remote-tracking branch 'cd/master'	makefu	2015-11-22	7	-6/+7
\| \|\ \ \ \ \ \| \| \| \|_\|/ / \| \| \|/\| \| \|
\| \| * \| \| \|	krebs: add cgit.stro.retiolum	tv	2015-11-18	1	-0/+1
\| \| * \| \| \|	krebs pkgs: s/retiolum/internet/	tv	2015-11-18	6	-6/+6
\| \| \| \|/ / \| \| \|/\| \|
\| * \| \| \|	k 5 cacpy: init at 0.6.0	makefu	2015-11-22	1	-0/+20
\| * \| \| \|	Merge branch 'master' of http://cgit.cd/stockholm	makefu	2015-11-17	1	-0/+10
\| \|\\| \| \| \| \| \|_\|/ \| \|/\| \|
\| \| * \|	Zhosts: add stro	tv	2015-11-17	1	-0/+10
* \| \| \|	k 3 tinc_graphs: add timeout	makefu	2015-12-03	1	-1/+1
\|/ / /
* \| \|	Merge remote-tracking branch 'cd/master'	makefu	2015-11-17	2	-0/+40
\|\\| \|
\| * \|	mv: init	tv	2015-11-17	2	-0/+40
* \| \|	acng: also add nar files to cache	makefu	2015-11-17	1	-1/+1
* \| \|	k 3 apt-cacher-ng: add CAfile	makefu	2015-11-17	1	-0/+1
* \| \|	k 3 shared: shack ip was already in use	makefu	2015-11-17	1	-1/+1
* \| \|	k 5 drivedroid-gen-repo: init at 0.4.2	makefu	2015-11-17	1	-0/+22
* \| \|	pubkeys: add exco	makefu	2015-11-17	1	-0/+1
* \| \|	shared wolf: static ip, fix todo	makefu	2015-11-17	2	-5/+11
* \| \|	apt-cacher-ng is imported by krebs modules	makefu	2015-11-17	1	-0/+1
* \| \|	k 3 apt-cacher-ng: fix whitespace	makefu	2015-11-17	1	-34/+35
* \| \|	apt-cacher-ng: init package and module	makefu	2015-11-17	2	-0/+176
* \| \|	Merge branch 'master' of pnp:stockholm	makefu	2015-11-15	1	-1/+1
\|\ \ \
\| * \| \|	tinc_graphs: always restart	makefu	2015-11-13	1	-1/+1
* \| \| \|	Merge remote-tracking branch 'cloudkrebs/master' into pre-merge	makefu	2015-11-14	6	-32/+200
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	l 5 go -> k 5 go	lassulus	2015-11-13	2	-0/+101
\| * \| \|	move testhosts to shared from lass	lassulus	2015-11-13	2	-32/+32
\| \|/ /
\| * \|	l 3 go -> k 3 go	lassulus	2015-11-13	2	-0/+67
\| * \|	Merge remote-tracking branch 'pnp/master'	lassulus	2015-11-12	2	-0/+2
\| \|\ \ \| \| \|/ \| \|/\|
* \| \|	Merge remote-tracking branch 'cd/master' into pre-merge	makefu	2015-11-14	7	-10/+243
\|\\| \|
\| * \|	{tv => krebs} git lib & git hooks	tv	2015-11-09	3	-2/+214
\| * \|	tv git: move old stuff to the museum section	tv	2015-11-09	1	-0/+3
\| * \|	xmonad-stockholm: init at 1.0.0	tv	2015-11-09	1	-0/+16
\| * \|	stockholm: check if default.nix exists before importing	tv	2015-11-09	1	-0/+2
\| * \|	push: 1.1.0 -> 1.1.1	tv	2015-11-08	1	-4/+3
\| \| \|
\| \| \
\| *-. \	Merge remote-tracking branches 'mors/master' and 'pnp/master'	tv	2015-11-07	13	-9/+231
\| \|\ \ \
\| \| * \ \	Merge remote-tracking branch 'pnp/master'	lassulus	2015-11-01	1	-2/+2
\| \| \|\ \ \
\| \| * \| \| \|	k 3 l: use rsa keys in prism	lassulus	2015-11-01	1	-2/+2
\| * \| \| \| \|	Merge remote-tracking branch 'cd/master'	tv	2015-11-07	3	-1/+40
\| \|\ \ \ \ \
\| * \| \| \| \| \|	xu: bump ssh key	tv	2015-11-07	1	-1/+2
\| * \| \| \| \| \|	nomic: bump ssh key	tv	2015-11-07	1	-1/+1
* \| \| \| \| \| \|	Merge branch 'master' of pnp:stockholm	makefu	2015-11-10	2	-0/+2
\|\ \ \ \ \ \ \ \| \| \|_\|_\|_\|_\|/ \| \|/\| \| \| \| \|
\| * \| \| \| \| \|	infest: add curl to debian deps	makefu	2015-11-10	1	-0/+1