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
..
nginx.conf.erb	Merge branch 'master' of https://github.com/jfryman/puppet-nginx into dev	2013-07-21 19:40:29 +04:00
proxy.conf.erb	Fix deprecated variable names	2013-07-17 20:42:57 +02:00
upstream.erb	Fix deprecated variable names	2013-07-17 20:42:57 +02:00