Skip to content

Commit

Permalink
Merge branch 'mod-passenger-2' of https://github.com/jonoterc/puppetl…
Browse files Browse the repository at this point in the history 
…abs-apache into mod-passenger-2

Conflicts:
	manifests/mod/passenger.pp
	manifests/params.pp
  • Loading branch information
@jonoterc
jonoterc committed Mar 29, 2014
2 parents d0883b9 + f73b4d4 commit fe03465
Showing 0 changed files with 0 additions and 0 deletions.

0 comments on commit fe03465

Please sign in to comment.