Tuomas Tynkkynen 2fec9c6e29 Merge remote-tracking branch 'upstream/master' into staging ... Conflicts: pkgs/development/tools/build-managers/conan/default.nix		2018-03-13 23:04:18 +02:00
..
4store
apache-httpd	apache-httpd: respect review in #33481	2018-01-06 18:40:44 +00:00
apache-modules	mod_wsgi: 3.5 -> 4.5.24	2018-03-04 18:32:00 +00:00
apt-cacher-ng	apt-cacher-ng: 0.9.1 -> 3.1	2017-11-22 09:21:58 +01:00
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	mariadb: lib -> connector-c	2017-12-29 02:18:35 +01:00
lwan	lwan: init at 0.1	2017-12-23 23:35:12 +00:00
micro-httpd
mini-httpd
myserver
nginx	Merge remote-tracking branch 'upstream/master' into staging	2018-03-13 23:04:18 +02:00
nix-binary-cache
openresty	openresty: 1.9.3.1 -> 1.13.6.1 (#36289)	2018-03-04 19:52:32 +00:00
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	tomcat9: 9.0.0.M17 -> 9.0.2	2018-01-09 01:31:06 +01:00
webfs
winstone
yaws	yaws: 2.0 -> 2.0.4	2018-02-27 19:20:46 -08:00