Vladimír Čunát ab15a62c68 Merge branch 'master' into closure-size ... Beware that stdenv doesn't build. It seems something more will be needed than just resolution of merge conflicts.		2016-04-01 10:06:01 +02:00
..
default.nix	Merge master into closure-size	2016-03-08 09:58:19 +01:00
default.upstream	Fixing automatic update of Nginx	2013-11-25 10:59:39 +04:00
modules.nix	Merge pull request #12525 from knupfer/ngx_brotli	2016-03-11 11:05:21 +01:00
unstable.nix	Merge master into closure-size	2016-03-08 09:58:19 +01:00
unstable.upstream	Add Nginx 1.7.7; RTMP module fails for some reason	2014-11-04 00:54:15 +03:00