nixpkgs/pkgs/servers/http/nginx
Eelco Dolstra 811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv
Conflicts:
	pkgs/tools/security/gnupg/default.nix
2014-10-09 10:57:57 +02:00
..
default.nix Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 2014-10-09 10:57:57 +02:00
default.upstream Fixing automatic update of Nginx 2013-11-25 10:59:39 +04:00