Vladimír Čunát ae74c356d9 Merge recent 'staging' into closure-size ... Let's get rid of those merge conflicts.		2016-02-03 16:57:19 +01:00
..
default.nix	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
default.upstream	Fixing automatic update of Nginx	2013-11-25 10:59:39 +04:00
modules.nix	nginx: add statsd to the available modules	2016-01-23 17:25:49 -05:00
unstable.nix	Merge recent 'staging' into closure-size	2016-02-03 16:57:19 +01:00
unstable.upstream	Add Nginx 1.7.7; RTMP module fails for some reason	2014-11-04 00:54:15 +03:00