summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/rangehttpserver
diff options
context:
space:
mode:
authorJörg Thalheim <Mic92@users.noreply.github.com>2021-07-14 15:03:46 +0100
committerGitHub <noreply@github.com>2021-07-14 15:03:46 +0100
commit04828c857bd27de47a07ab0bb0765e0c713bfec2 (patch)
treed3194cbefa12c70bced6fbaf17346ba63554e1ec /pkgs/development/python-modules/rangehttpserver
parent266cb48e6549ecec997b929c22b77006dcc250cb (diff)
parent7afa51c2bdc6eed033e4b6fb6ebb79ec05b4e3f0 (diff)
Merge pull request #130181 from Mic92/merge-staging-next
Fix merge conflicts: master -> staging-next
Diffstat (limited to 'pkgs/development/python-modules/rangehttpserver')
0 files changed, 0 insertions, 0 deletions