Franz Pletz f8d481754c Merge remote-tracking branch 'origin/master' into hardened-stdenv		2016-05-18 17:10:02 +02: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	Merge pull request #12525 from knupfer/ngx_brotli	2016-03-11 11:05:21 +01:00
unstable.upstream	nginx: restore .upstream files	2016-05-06 15:37:22 +02:00