summaryrefslogtreecommitdiff
path: root/puppet/modules/soledad/manifests/common.pp
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2015-08-31 12:22:56 -0700
committerelijah <elijah@riseup.net>2015-08-31 12:22:56 -0700
commitbe8f7335cc273f85a1949557962dd65d88548679 (patch)
tree4fd4fdbed428f62358c1e930722f0b02a66b294b /puppet/modules/soledad/manifests/common.pp
parent4f42910a6792ec3016aa6f9d0792801f75972a62 (diff)
parentb5fbda1ca3832043e1636ee964a806ff222cb05f (diff)
Merge branch 'feature/mxalias' into develop
Diffstat (limited to 'puppet/modules/soledad/manifests/common.pp')
0 files changed, 0 insertions, 0 deletions