Martin Weinelt ffe3165b27 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: - nixos/doc/manual/release-notes/rl-2305.section.md		2023-03-21 12:35:53 +01:00
..
config	Merge master into staging-next	2023-03-20 00:02:29 +00:00
hardware	Merge pull request #194594 from nbraud/hidpi	2023-03-19 19:22:40 +01:00
i18n/input-method	nixos/manual: render module chapters with nixos-render-docs	2023-01-27 20:07:34 +01:00
installer	Merge pull request #219351 from tie/make-bios-bootable	2023-03-16 11:33:03 -03:00
misc	solr: drop	2023-03-16 16:17:04 +02:00
profiles	nixos/profiles/base: remove duplicate and optimize fsPackages	2023-03-03 23:32:48 +03:00
programs	nixos/regreet: init	2023-03-20 02:01:50 +02:00
security	Merge master into staging-next	2023-03-17 17:57:00 +00:00
services	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-21 12:35:53 +01:00
system	Merge staging-next into staging	2023-03-15 18:01:44 +00:00
tasks	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-14 16:49:37 +01:00
testing	Merge pull request #207801 from ElvishJerricco/systemd-stage-1-test-instrumentation	2022-12-28 01:43:03 +01:00
virtualisation	Merge #219444: staging-next 2023-03-04	2023-03-15 17:35:39 +01:00
module-list.nix	Merge remote-tracking branch 'origin/master' into staging-next	2023-03-21 12:35:53 +01:00
rename.nix	baget: remove due to upstream being unmaintained	2023-03-19 14:19:49 +01:00