diff options
| author | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-01-27 00:54:10 -0500 |
|---|---|---|
| committer | Dmitry Kalinkin <dmitry.kalinkin@gmail.com> | 2022-01-27 00:54:10 -0500 |
| commit | 0693fd77f772c9b65fe819f383321035323ffd0d (patch) | |
| tree | 92adbbb6683e7d814d772026355ee5bdc2e44735 /pkgs/development/python-modules/pytest-httpserver | |
| parent | b20ad47fa3fe642a15a6a56250af62d19228d051 (diff) | |
| parent | b32ed60c942b8b039b25e0a44fea32d58fb894db (diff) | |
Merge branch 'staging-next' into staging
Conflicts:
nixos/doc/manual/from_md/release-notes/rl-2205.section.xml
nixos/doc/manual/release-notes/rl-2205.section.md
pkgs/development/python-modules/aioesphomeapi/default.nix
pkgs/development/python-modules/mat2/default.nix
pkgs/development/python-modules/pydevccu/default.nix
pkgs/development/python-modules/pywlroots/default.nix
pkgs/development/python-modules/rokuecp/default.nix
Diffstat (limited to 'pkgs/development/python-modules/pytest-httpserver')
0 files changed, 0 insertions, 0 deletions