Daniel Peebles daf16b5679 Merge pull request #25391 from Mic92/nixos-prepare-root ... nixos-prepare-root: force symlink at /run		2017-05-01 10:15:36 -04:00
..
config	Merge pull request #22489 from avnik/nixos-locales	2017-04-30 18:19:31 +02:00
hardware
i18n/input-method
installer	nixos-prepare-root: force symlink at /run	2017-05-01 16:10:58 +02:00
misc	Merge branch 'master' into clickhouse	2017-05-01 07:33:31 +02:00
profiles	nixos/hardened profile: disable user namespaces at runtime	2017-04-30 15:17:27 +02:00
programs	Merge pull request #24803 from pajowu/master	2017-05-01 11:27:17 +02:00
security	nixos/lock-kernel-modules: fix typo in unitConfig	2017-04-30 15:17:29 +02:00
services	Merge pull request #25168 from tadfisher/ups-fix	2017-05-01 16:09:18 +02:00
system	Merge pull request #25005 from Lassulus/copytoram	2017-04-30 11:22:45 +02:00
tasks	Add Elantech ETPS/2 Trackpoint (ThinkPad Yoga 260)	2017-04-22 13:42:57 +02:00
testing
virtualisation	Merge pull request #25245 from bachp/docker-proxy	2017-04-27 11:03:46 +02:00
module-list.nix	Merge pull request #24803 from pajowu/master	2017-05-01 11:27:17 +02:00
rename.nix	zsh-syntax-highlighting: Add more configuration options and move to module (#25153)	2017-04-23 21:17:31 +02:00