Vladimír Čunát d9c5d584cd Merge branch 'master' into release-docs ... It's been a very long time, so I think a merge will be better than a rebase. There was only one simple conflict.		2019-10-27 10:29:58 +01:00
..
assertions.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
building-nixos.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
building-parts.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
development.xml	nixos/manual: add dummy ids to silence warnings	2019-02-08 10:23:57 +01:00
importing-modules.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
meta-attributes.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
nixos-tests.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
option-declarations.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
option-def.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
option-types.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
releases.xml	Merge branch 'master' into release-docs	2019-10-27 10:29:58 +01:00
replace-modules.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
running-nixos-tests-interactively.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
running-nixos-tests.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
sources.xml	Remove references to the nixpkgs-channels repo	2019-10-17 19:44:03 +02:00
testing-installer.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
writing-documentation.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
writing-modules.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00
writing-nixos-tests.xml	Revert "nixos/doc: re-format"	2019-09-19 19:17:30 +02:00