Joachim F e97d8fc0cb Merge pull request #39455 from Ekleog/matterbridge-configfile ... matterbridge module: add configPath option as a workaround, waiting for nix encryption		2018-05-06 17:29:43 +00:00
..
config	treewide: isArm -> isAarch32	2018-04-25 15:28:55 -04:00
hardware	Merge branch 'master' into staging	2018-04-10 09:13:36 +02:00
i18n/input-method	Added cross-references to NixOS manual	2018-04-12 09:39:14 +10:00
installer	nix: 2.0.1 -> 2.0.2	2018-05-04 13:28:36 +02:00
misc	nixos/documentation: Correct use of lib.optional	2018-05-05 15:55:53 +07:00
profiles	Merge pull request #38114 from oxij/nixos/doc-module	2018-04-05 07:09:32 +00:00
programs	Merge pull request #38831 from rdnetto/improve-cross-refs	2018-04-30 21:30:20 -04:00
security	Merge pull request #38831 from rdnetto/improve-cross-refs	2018-04-30 21:30:20 -04:00
services	Merge pull request #39455 from Ekleog/matterbridge-configfile	2018-05-06 17:29:43 +00:00
system	switch-to-configuration: use Net::DBus to retrieve the list of units	2018-05-03 20:19:23 +02:00
tasks	lxd: 2.16 -> 3.0.0	2018-04-14 11:02:24 +01:00
testing	nixos/qemu: Deduplicate QEMU serialDevice into qemu-flags.nix	2018-01-30 16:57:27 +02:00
virtualisation	Merge pull request #39654 from AmineChikhaoui/issue-38623	2018-05-03 17:16:26 +02:00
module-list.nix	Merge pull request #39991 from xeji/remove-fleet	2018-05-05 08:07:14 +02:00
rename.nix	Merge pull request #39048 from oxij/nixos/fix-rename-bugs	2018-04-22 17:46:09 +00:00