diff options
| author | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 11:22:26 -0300 |
|---|---|---|
| committer | Silvio Rhatto <rhatto@riseup.net> | 2016-03-19 11:22:26 -0300 |
| commit | 01e32b5549fad5ec719a8650f5dbfac739e9c2fd (patch) | |
| tree | aba6a0b71fab1e87dea6d5ede0c73d0c5e51c428 /files | |
| parent | fee18a9d990fc03c696c3dab17c5c111c7d1264f (diff) | |
| parent | 497513547be79f9d3c8e96f1650ec43ee634b277 (diff) | |
| download | puppet-backupninja-01e32b5549fad5ec719a8650f5dbfac739e9c2fd.tar.gz puppet-backupninja-01e32b5549fad5ec719a8650f5dbfac739e9c2fd.tar.bz2 | |
Merge remote-tracking branch 'shared/master' into develop
Conflicts:
templates/backupninja.conf.erb
templates/sh.conf.erb
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions