Jonathan Ringer fc25d94010 Merge remote-tracking branch 'origin/master' into staging-next ... Conflicts: pkgs/development/python-modules/jupyter-client/default.nix pkgs/development/python-modules/jupyterlab-git/default.nix		2021-10-22 09:33:07 -07:00
..
manual	Merge remote-tracking branch 'origin/master' into staging-next	2021-10-22 09:33:07 -07: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