Alyssa Ross d7e181ff83 Merge remote-tracking branch 'nixpkgs/staging-next' into staging ... Conflicts: pkgs/development/compilers/ocaml/4.12.nix pkgs/development/python-modules/oci/default.nix pkgs/tools/admin/bubblewrap/default.nix		2022-03-14 12:33:16 +00:00
..
manual	Merge remote-tracking branch 'nixpkgs/staging-next' into staging	2022-03-14 12:33:16 +00:00
varlistentry-fixer.rb	nixos/doc/*: fix indentation	2020-11-12 14:24:00 +10:00
xmlformat.conf	doc: Disable wrapping source	2019-09-18 21:17:52 +02:00