Justice London 6911b91f9e Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master ... Conflicts: templates/vhost/vhost_location_fastcgi.erb		2013-08-02 13:07:53 -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	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into jfryman-master	2013-08-02 13:07:53 -04:00