diff options
author | varac <varacanero@zeromail.org> | 2016-05-18 13:39:56 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-05-18 13:39:56 +0200 |
commit | c046daea6d31e929eee45e47762240b800554d2f (patch) | |
tree | d83f557d027030021329b4f40150757948cb2c97 /puppet/modules/soledad/templates/soledad-server.conf.erb | |
parent | 22286f450bef6a28a08f5ff527e3a4f040fab4c3 (diff) | |
parent | 3e63ce3c71620433dc135959b2743aa010b28fe1 (diff) |
Merge branch 'tests' into develop
Diffstat (limited to 'puppet/modules/soledad/templates/soledad-server.conf.erb')
0 files changed, 0 insertions, 0 deletions