Lebedev Vadim 20a37a220f Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev ... Conflicts: manifests/config.pp manifests/resource/location.pp		2013-09-08 16:50:16 +04:00
..
conf.d	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-09-08 16:50:16 +04:00
mailhost	add support for mail module	2013-04-06 11:11:23 +02:00
vhost	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-09-08 16:50:16 +04:00