Vladimír Čunát 707c7e4ea8 deluge service: fix my bad conflict resolution from f21211ebf ... I'm sorry. Thanks to aszlig.		2019-09-08 08:42:53 +02:00
..
config	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
hardware	Merge branch 'master' into staging-next	2019-09-04 11:00:56 +02:00
i18n/input-method	nixos/ibus: do not default-install ibus-qt	2019-08-10 19:37:12 +02:00
installer	iso-image-kde: Disable synaptics	2019-09-07 03:30:45 -04:00
misc	Merge staging-next into staging	2019-08-31 10:04:20 +02:00
profiles	Merge pull request #63773 from flokli/installation-device-fixes	2019-08-31 02:59:23 +02:00
programs	Merge master into staging-next	2019-09-06 22:46:05 +02:00
security	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
services	deluge service: fix my bad conflict resolution from f21211ebf	2019-09-08 08:42:53 +02:00
system	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
tasks	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
testing	nixos/test: remove the stateVersion statement from the test-instrumentation	2019-06-03 15:05:24 +02:00
virtualisation	Merge master into staging-next	2019-09-06 22:46:05 +02:00
module-list.nix	nixos/system-config-printer: init	2019-09-06 09:40:17 -04:00
rename.nix	nixos/prometheus: remove prometheus1 module, rename prometheus2	2019-09-06 21:55:23 +02:00