diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-12-05 13:04:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-12-05 13:07:26 +0100 |
| commit | 689d6303e895687ba4813952ceb55bbf63c8ef47 (patch) | |
| tree | ff2f300658083e9c7c59833f70e17f59375a6bba /pkgs/development/python-modules/httpserver | |
| parent | a9b59003600e8d4891966e079c660212651c3b55 (diff) | |
| parent | fd7953d95f478c8cb0ac9db3718adb793142e31d (diff) | |
Merge branch 'master' into staging
The haskell split got reverted (again).
Hydra: ?compare=1416012
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions