Jan Tojnar cdf426488b Merge branch 'master' into staging-next ... Fixed trivial conflicts caused by removing rec.		2019-09-06 03:20:09 +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	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +02: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 branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
security	Merge branch 'master' into staging	2019-09-02 23:25:24 +02:00
services	Merge branch 'master' into staging-next	2019-09-06 03:20:09 +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 branch 'master' into staging-next	2019-09-06 03:20:09 +02:00
module-list.nix	nixos/railcar: init	2019-09-04 22:46:42 +00:00
rename.nix	nixos/kubernetes: make module compatible with v1.15.x	2019-09-04 17:38:41 +02:00