summaryrefslogtreecommitdiff
path: root/templates/distributions.erb
diff options
context:
space:
mode:
authorMicah Anderson <micah@riseup.net>2013-02-13 12:00:08 -0500
committerMicah Anderson <micah@riseup.net>2013-02-13 12:00:08 -0500
commitc58c6772a0b3aea6f8e807af9bad3070c0a7ac18 (patch)
treec76c89448de60344f7ef36f0f593ea07d209f47e /templates/distributions.erb
parente20017a22d135361980c4889f1827e5ecd3fd1af (diff)
parent9878f1e0b68f5c68cdb8deeb795618ccbcf4c25e (diff)
Merge branch 'lint' into leap
Conflicts: manifests/lighty.pp
Diffstat (limited to 'templates/distributions.erb')
0 files changed, 0 insertions, 0 deletions