No description
Find a file
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
manifests Merge branch 'master' of https://github.com/joejulian/puppetlabs-nginx 2013-03-20 21:44:45 +04:00
templates Merge branch 'master' of https://github.com/jfryman/puppet-nginx 2013-03-20 21:11:28 +04:00
tests Merge remote-tracking branch 'jfryman/master' into merge_upstream 2012-11-08 10:09:49 -08:00
.gitignore Added vhost support 2011-06-02 14:49:39 -05:00
ChangeLog Rebase bashtoni's pull request from a year ago: 2012-12-05 23:11:29 -08:00
LICENSE 20110524 Work Snapshot 2011-05-24 21:20:48 -05:00
Modulefile added anchor pattern 2011-06-21 12:03:47 -07:00
README Updated Documentation 2011-06-06 17:38:40 -05:00
README.markdown Update README.markdown 2012-12-14 00:14:25 -06:00