Dmitry Kalinkin 219590673c Merge branch 'staging-next' into staging ... Conflicts: pkgs/development/python-modules/panel/default.nix pkgs/os-specific/linux/kernel/generic.nix pkgs/servers/home-assistant/default.nix		2021-04-08 22:42:26 -04:00
..
default.nix	Merge branch 'staging-next' into staging	2021-04-08 22:42:26 -04:00
hardcode-nodejs-npmjs-paths.patch	intake: 0.4.4 -> 0.5.3 (#66412)	2019-09-01 00:32:43 -06:00