Skip to content

Fix errors introduced with merge 4dd435e7e5b6f82bd776b7b07b1de62cbd1bdf11 #47

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Nov 26, 2013
Merged

Fix errors introduced with merge 4dd435e7e5b6f82bd776b7b07b1de62cbd1bdf11 #47

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
be31373
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Oct 27, 2013
9ea8619
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Oct 31, 2013
53c3775
Merge branch 'master' of https://github.com/example42/puppet-nginx
javierbertoli Nov 24, 2013
7a38ad1
Revert template errors introduced in commit 4dd435e7e5b6f82bd776b7b07…
javierbertoli Nov 26, 2013
0538933
Merge branch 'fix_bad_merge'
javierbertoli Nov 26, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Merge branch 'master' of https://github.com/example42/puppet-nginx
  • Loading branch information
@javierbertoli
javierbertoli committed Oct 31, 2013
commit 9ea8619e4a347a806bbba092314b39dbc4e583c6

This merge commit was added into this branch cleanly.

There are no new changes to show, but you can still view the diff.