summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:40:33 -0300
committerSilvio Rhatto <rhatto@riseup.net>2016-03-23 20:40:33 -0300
commit5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8 (patch)
treeae15452aae7e26273f99d51543268ab75da1e637 /files
parentd3cd26efcb2271a968f802090b9e96d17f8ff6df (diff)
parent4ce75b3bf26c3d8de6f9302e8e6d0c937ea4711a (diff)
downloadpuppet-apcupsd-5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8.tar.gz
puppet-apcupsd-5b914fa948ccbdc6b10cc9f6c559f68dfb5f2be8.tar.bz2
Merge remote-tracking branch 'lelutin/master'
Conflicts: manifests/init.pp
Diffstat (limited to 'files')
0 files changed, 0 insertions, 0 deletions