diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-14 09:50:48 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-14 09:53:21 +0200 |
| commit | d5d94127fd6468febe4f5e8eba8cb231bbd56103 (patch) | |
| tree | 53efc69e691bdf7c7415039f5cdddb90d8fb5fc4 /pkgs/development/python-modules/rangehttpserver | |
| parent | 43c910047f4f2882cf9cba1d38045c3f6ebee051 (diff) | |
| parent | 069038f0931658e6030876f37f81dfb6825f884c (diff) | |
Merge branch 'staging-next' into staging
Minor conflicts; I hope I didn't mess up:
pkgs/development/tools/misc/binutils/default.nix
pkgs/games/openjk/default.nix
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions
