Michael Bishop 7256d10d00 Merge pull request #68368 from toonn/toxvpn-typo ... nixos/toxvpn: Fix typo in option description		2019-09-09 14:35:22 -03:00
..
config	Merge pull request #67795 from matthewbauer/remove-hidden-bins	2019-09-09 12:26:55 -04:00
hardware	treewide: remove redundant quotes	2019-09-08 23:38:31 +00: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	treewide: remove redundant quotes	2019-09-08 23:38:31 +00:00
security	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
services	Merge pull request #68368 from toonn/toxvpn-typo	2019-09-09 14:35:22 -03:00
system	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
tasks	nixos/networkd: continue supporting 99-main with wildcard interface match	2019-09-08 17:14:13 +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	Merge pull request #67241 from kcalvinalvin/cmt	2019-09-08 22:33:30 +02:00
rename.nix	nixos/prometheus: remove prometheus1 module, rename prometheus2	2019-09-06 21:55:23 +02:00