Tuomas Tynkkynen 34f95d92a2 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/applications/misc/pytrainer/default.nix pkgs/development/tools/pew/default.nix pkgs/tools/misc/you-get/default.nix		2018-02-28 20:52:49 +02:00
..
4store
apache-httpd
apache-modules
apt-cacher-ng
couchdb
darkhttpd
gatling
h2o	h2o: init at 2.2.4	2018-02-15 13:46:48 -06:00
hiawatha	hiawatha: 10.5 -> 10.7	2018-02-26 18:40:18 -08:00
hyp
jboss
jetty
lighttpd
lwan
micro-httpd
mini-httpd
myserver
nginx	nginx/modules: brotli: no-op bump to latest that uses 1.0.2 as submodule	2018-02-20 14:08:22 -06:00
nix-binary-cache
openresty
pshs	pshs: 0.3.1 -> 0.3.2	2018-02-28 14:23:22 +00:00
redstore
spawn-fcgi
thttpd	thttpd: 2.27 -> 2.28	2018-02-28 12:18:24 +01:00
tomcat
webfs
winstone
yaws	yaws: 2.0 -> 2.0.4	2018-02-27 19:20:46 -08:00