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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master' into master	lassulus	2020-11-23	52	-1292/+1365
\|\
\| *	ma hw: tlp.extraConfig -> tlp.settings	makefu	2020-11-18	1	-13/+10
\| *	ma ham/light/groups: init	makefu	2020-11-18	2	-0/+47
\| *	ma editor/vim: use py3k for youcompleteme support	makefu	2020-11-18	1	-3/+1
\| *	ma omo.r: zigbee2mqtt is included via ham	makefu	2020-11-18	1	-1/+0
\| *	ma default: remove double-defined tmp	makefu	2020-11-18	1	-3/+0
\| *	ma gui/base: fix warnings	makefu	2020-11-18	1	-2/+4
\| *	ma pkgs.hactool: rip	makefu	2020-11-18	1	-30/+0
\| *	ma snapraid module: fix warning about string	makefu	2020-11-18	1	-1/+1
\| *	ma ham/firetv_restart: fix typo	makefu	2020-11-18	1	-1/+1
\| *	ma zigbee2mqtt: add comment about mkForce	makefu	2020-11-18	1	-0/+1
\| *	ma ham: use new home-assistant merge function	makefu	2020-11-18	9	-331/+342
\| *	ma ham/zigbee2mqtt: use upstream module	makefu	2020-11-18	3	-139/+148
\| *	ma wireguard/server: remove restart logic	makefu	2020-11-18	1	-4/+0
\| *	ma sickbeard: use python37	makefu	2020-11-18	1	-3/+3
\| *	ma bureautomation: update team	makefu	2020-11-18	1	-16/+22
\| *	ma bureautomation: move to 20.09 style imports	makefu	2020-11-18	29	-751/+794
\| *	Merge remote-tracking branch 'lass/20.09' into 20.09	makefu	2020-11-18	11	-316/+26
\| \|\
\| * \|	ma bgt/download: remove obsolete netdata entry	makefu	2020-11-18	1	-11/+3
\| * \|	ma download.binaergewitter.de: fix for 20.09	makefu	2020-11-18	1	-0/+5
* \| \|	Merge remote-tracking branch 'mic92/master' into master	lassulus	2020-11-23	1	-2/+2
\|\ \ \
\| * \| \|	mic92: fix bernie tinc address	Jörg Thalheim	2020-11-20	1	-2/+2
* \| \| \|	l: init styx.r	lassulus	2020-11-23	3	-0/+153
\|/ / /
* \| \|	mic92: improve tinc cross-compiling	Jörg Thalheim	2020-11-20	1	-2/+4
* \| \|	mic92: add bernie	Jörg Thalheim	2020-11-19	1	-0/+28
* \| \|	mic92: add loki.r alias to rock.r	Jörg Thalheim	2020-11-19	1	-1/+4
* \| \|	l: fix lib usage	lassulus	2020-11-19	1	-1/+1
* \| \|	remove deprecated hass module	lassulus	2020-11-19	8	-87/+36
\| \|/ \|/\|
* \|	Merge remote-tracking branch 'gum/20.09' into 20.0920.09	lassulus	2020-11-18	3	-12/+29
\|\\|
\| *	ma owncloud: use php.buildEnv	makefu	2020-11-17	1	-7/+20
\| *	pkgs.alertmanager-bot-telegram: fix vendorSha256	makefu	2020-11-17	1	-1/+1
\| *	puyak.r: disable newsbot for now	makefu	2020-11-17	1	-3/+8
\| *	ma owncloud: disable memcached	makefu	2020-11-17	1	-2/+1
* \|	Merge remote-tracking branch 'ni/master' into 20.09	lassulus	2020-11-17	1	-2/+2
\|\ \
\| * \|	email-header: 0.4.1-tv1 -> 0.4.1-tv2	tv	2020-11-17	1	-2/+2
* \| \|	Merge remote-tracking branch 'ni/master' into 20.09	lassulus	2020-11-17	8	-300/+4
\|\\| \|
\| * \|	tv: pass -> pass-otp	tv	2020-11-17	8	-300/+4
* \| \|	Merge remote-tracking branch 'gum/20.09' into 20.09	lassulus	2020-11-17	5	-51/+10
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	shack/glados: disable dwd_pollen	makefu	2020-11-17	2	-48/+3
\| * \|	Merge remote-tracking branch 'lass/20.09' into 20.09	makefu	2020-11-17	3	-9/+165
\| \|\ \
\| * \| \|	ma hw/tp-x2x0: use utillinux instead of rfkill package	makefu	2020-11-17	1	-1/+1
\| * \| \|	ma gum.r: disable gitlab-runner	makefu	2020-11-17	1	-1/+5
\| * \| \|	Merge remote-tracking branch 'lass/20.09' into 20.09	makefu	2020-11-17	1	-8/+8
\| \|\ \ \
\| * \| \| \|	shack/mqtt_sub: use python3 instead of 3.5	makefu	2020-11-17	1	-1/+1
* \| \| \| \|	Merge branch 'master' into 20.09	lassulus	2020-11-17	1	-1/+0
\|\ \ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'ni/master'	lassulus	2020-11-17	1	-1/+0
\| \|\ \ \ \ \ \| \| \| \|_\|_\|/ \| \| \|/\| \| \|
\| \| * \| \| \|	tv configs xmonad: remove fzmenu from PATH	tv	2020-11-17	1	-1/+0
* \| \| \| \| \|	Merge branch 'master' into 20.09	lassulus	2020-11-17	1	-13/+20
\|\\| \| \| \| \| \| \|_\|_\|_\|/ \|/\| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2020-11-17	3	-14/+177
\| \|\\| \| \|
\| \| * \| \|	much: 1.2.0 -> 1.3.0	tv	2020-11-17	1	-13/+20