diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-08-29 10:51:54 +0200 |
| commit | 2858c41823db1654f123c455cca2b145b8d8737b (patch) | |
| tree | 48518e1eb8916d1528d75823c2d1232822d059e9 /pkgs/development/python-modules/httpserver | |
| parent | 34b6bbe021baa11a4dddf9532b331dac8d4162f2 (diff) | |
| parent | e1f755e44faa5745ad3a8b18e18017e77dfbe67c (diff) | |
Merge branch 'master' into staging
There were some conflicts in python modules, commented at #28314.
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions