summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/httpserver
diff options
context:
space:
mode:
authorVladimír Čunát <vcunat@gmail.com>2017-05-01 17:53:58 +0200
committerVladimír Čunát <vcunat@gmail.com>2017-05-01 18:00:21 +0200
commit92ee3b02e85f489e0e56180d0fb919934ec38d31 (patch)
tree4e2eeba150516f07fd7d69220a6ede9bd70c6efc /pkgs/development/python-modules/httpserver
parent27b7e2f7dae0ab57746320e1900f3175ad7f2847 (diff)
parent9860e77f79a7a54bb8f5dcbe15f44490c9d5edb6 (diff)
Merge branch 'staging'
Master is seeing a very large rebuild now, and this version of staging seemed rather fine already (only a few thousand builds remaining now). I really didn't want to wait a few more days because of this.
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions