Jonathan Ringer e379e3d4bb Merge remote-tracking branch 'origin/staging-next' into staging ... Conflicts: pkgs/development/python-modules/googleapis-common-protos/default.nix		2022-01-24 23:49:19 -08:00
..
manual	Merge remote-tracking branch 'origin/staging-next' into staging	2022-01-24 23:49:19 -08: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