]> gitweb.fluxo.info Git - puppet-backup.git/commitdiff
projects / puppet-backup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 86b694f 1b95fb7)
Merge branch 'master' into develop
authorSilvio Rhatto <rhatto@riseup.net>
Fri, 11 Sep 2015 18:35:39 +0000 (15:35 -0300)
committerSilvio Rhatto <rhatto@riseup.net>
Fri, 11 Sep 2015 18:35:39 +0000 (15:35 -0300)
1  2 
files/sync-media patch | diff1 | diff2 | blob | history

diff --cc files/sync-media
Simple merge
Puppet module for backups