diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 15:45:37 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-02-15 15:45:37 +0200 |
| commit | b1916b45a374815c9f6101b9f6a30b35b7c92ecb (patch) | |
| tree | 08d7be26385fe1f69922cd985d7f2e68f27884f6 /pkgs/development/python-modules/httpserver | |
| parent | 0a941e0b66ab86cf359d4f158bda86c9742c4b2b (diff) | |
| parent | 79e7f7af9a2262f8d8e6bea2b32d18f24b668a0c (diff) | |
Merge remote-tracking branch 'upstream/staging' into gcc-7
Conflicts:
pkgs/development/libraries/libidn/default.nix
pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions