Lebedev Vadim 23c5bf7a9e Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx ... Conflicts: manifests/resource/location.pp manifests/resource/vhost.pp		2013-03-20 21:44:45 +04:00
..
location.pp	Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx	2013-03-20 21:44:45 +04:00
upstream.pp	Style compliance	2011-06-15 14:43:01 -07:00
vhost.pp	Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx	2013-03-20 21:44:45 +04:00