Lebedev Vadim 757bb87031 Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev ... Conflicts: manifests/params.pp manifests/resource/location.pp manifests/resource/vhost.pp templates/vhost/vhost_header.erb		2013-09-05 12:01:00 +04:00
..
location.pp	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-09-05 12:01:00 +04:00
mailhost.pp	fixing boolean comparisons	2013-05-26 14:24:40 +02:00
upstream.pp	Add support for upstream_cfg_prepend	2013-04-22 10:03:09 +02:00
vhost.pp	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-09-05 12:01:00 +04:00