Robin Gloster 8031cba2ab Merge remote-tracking branch 'upstream/master' into hardened-stdenv		2016-06-10 09:27:04 +00:00
..
default.nix	Merge remote-tracking branch 'origin/master' into hardened-stdenv	2016-05-18 17:10:02 +02:00
default.upstream	nginx: restore .upstream files	2016-05-06 15:37:22 +02:00
modules.nix	nginxModules.lua: 0.10.0 -> 0.10.5	2016-06-05 12:48:06 +02:00
unstable.upstream	nginx: restore .upstream files	2016-05-06 15:37:22 +02:00