Lebedev Vadim ae9303233c Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev ... Conflicts: manifests/init.pp		2013-07-21 19:40:29 +04:00
..
conf.d	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-07-21 19:40:29 +04:00
mailhost	add support for mail module	2013-04-06 11:11:23 +02:00
vhost	Fix undefined method `sort_by' error from vhost_location_empty.erb	2013-07-18 14:36:56 -07:00