summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/httpserver
diff options
context:
space:
mode:
authorRobin Gloster <mail@glob.in>2016-06-11 10:07:46 +0000
committerRobin Gloster <mail@glob.in>2016-06-11 10:07:46 +0000
commit851446e26ecfda12be4fbda6809eec8b62e854c2 (patch)
tree1fdd82cfa3e2ac4dc4b6ac729060d43f35573113 /pkgs/development/python-modules/httpserver
parent8031cba2ab3146977141fc504bea2a1e03b5c126 (diff)
fix merge failure
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions