summaryrefslogtreecommitdiff
path: root/files/upgrade_initiator
diff options
context:
space:
mode:
authorJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-02-20 16:15:02 -0500
committerJerome Charaoui <jcharaoui@cmaisonneuve.qc.ca>2015-02-20 16:15:02 -0500
commit8ed07cac2f084bfe542f4978daa783aedd7e79b4 (patch)
tree93020168f8979b317c3a7c93e2b8ec154078385a /files/upgrade_initiator
parente3e0b46ca6039170c2d2faa8b2bebf14460679eb (diff)
parent53e78e61fefefe85939a3c3b5efcd147deebca61 (diff)
Merge branch 'master' of git://git.puppet.immerda.ch/module-apt
Conflicts: templates/Debian/sources.list.erb
Diffstat (limited to 'files/upgrade_initiator')
0 files changed, 0 insertions, 0 deletions