Jan Malakhovski ad35019501 Merge branch 'master' into staging ... Fixed conflicts: - lib/systems/for-meta.nix: in favor of staging - pkgs/os-specific/darwin/xcode/default.nix: in favor of master		2018-05-26 00:20:17 +00:00
..
admin
archivers
audio	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
backup
bluetooth
bootloaders/refind
cd-dvd
compression
filesystems	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
graphics
inputmethods
misc	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
networking
nix/info
package-management	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
security	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
system	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
text
typesetting	Merge branch 'master' into staging	2018-05-26 00:20:17 +00:00
video
virtualization
X11