diff options
| author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-14 21:18:27 +0200 |
|---|---|---|
| committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2018-01-14 21:18:27 +0200 |
| commit | 6ed0fe7e450def967685ec11b789bfe32002d1c1 (patch) | |
| tree | 409bf318be731969061398dc5a11c5d3c360484f /pkgs/development/python-modules/httpserver | |
| parent | c08042ba4b507cc0d494b1b9ca0895cc25db83d4 (diff) | |
| parent | b986078593af4108371c210ce0106b6b3e82ee20 (diff) | |
Merge remote-tracking branch 'upstream/master' into staging
Conflicts:
pkgs/build-support/fetchbower/default.nix
pkgs/build-support/fetchdarcs/default.nix
pkgs/build-support/fetchgx/default.nix
pkgs/development/python-modules/botocore/default.nix
pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix
pkgs/tools/admin/awscli/default.nix
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions