]> gitweb.fluxo.info Git - puppet-ejabberd.git/commitdiff
projects / puppet-ejabberd.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ae70891 1995519)
Merge branch 'master' of git://git.puppet.immerda.ch/module-ejabberd master
authorSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Jan 2013 21:48:32 +0000 (19:48 -0200)
committerSilvio Rhatto <rhatto@riseup.net>
Thu, 17 Jan 2013 21:48:32 +0000 (19:48 -0200)
Conflicts:
manifests/base.pp

1  2 
manifests/base.pp patch | diff1 | diff2 | blob | history

diff --cc manifests/base.pp
Simple merge
Puppet module for ejabberd