summaryrefslogtreecommitdiff
path: root/pkgs/development/python-modules/httpserver
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2017-12-04 15:25:34 +0000
committerOrivej Desh <orivej@gmx.fr>2017-12-04 15:25:34 +0000
commit59bcd866404e083d854a2de7fe1edb914ccddebf (patch)
tree92d268a4d0644b7f57d648a39ab96fb00e704780 /pkgs/development/python-modules/httpserver
parent6b42b5a0ef366857692e7e8502aa37cdbb22b642 (diff)
parent67a86f78139f9ab3bf83c0069db12a11e5a47393 (diff)
Merge branch 'master' into staging
* master: (53 commits) hashcat: 4.0.0 -> 4.0.1 vault: add nixos test emem: 0.2.48 -> 0.2.50 nixos/nat: add dmzHost option (#32257) vulnix: 1.3.4 -> 1.4.0 linux-4.13: mark as insecure (+required generic changes) vault: 0.8.3 -> 0.9.0 gox: 20140904 -> 0.4.0 guitarix: 0.35.6 -> 0.36.1 geolite-legacy: 2017-10-25 -> 2017-12-02 premake5: 5.0.0pre.alpha.11 -> 5.0.0-alpha12 otfcc: build with ninja python/hetzner: 0.7.5 -> 0.8.0 linux-testing: 4.15-rc1 -> 4.15-rc2 Revert "linux_4_13: Remove, no longer supported." jenkins: 2.92 -> 2.93 psc-package: 0.2.4 -> 0.2.5 dino: 2017-09-26 -> 2017-12-03 gnome3.gpaste: fix keybindings path plasma: 5.11.3 -> 5.11.4 ...
Diffstat (limited to 'pkgs/development/python-modules/httpserver')
0 files changed, 0 insertions, 0 deletions