diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 21:24:54 -0200 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2013-01-20 21:24:54 -0200 |
| commit | 3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01 (patch) | |
| tree | df97fe71507fd9eeed3deb08b87f41a503e75bbe /files | |
| parent | 999e4e426996f3169b0a8f647eee8e8ab4ec8c33 (diff) | |
| parent | 88a39666e5b0ddf668baf93c111b549628f79704 (diff) | |
| download | puppet-bind-3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01.tar.gz puppet-bind-3d9feb7f47151c9b828a5ff2e74d2f0d97ebab01.tar.bz2 | |
Merge branch 'master' of https://github.com/camptocamp/puppet-bind
Conflicts:
manifests/definitions/bind-mx.pp
Diffstat (limited to 'files')
| -rw-r--r-- | files/empty/.placeholder | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/files/empty/.placeholder b/files/empty/.placeholder deleted file mode 100644 index e69de29..0000000 --- a/files/empty/.placeholder +++ /dev/null |