diff options
author | varac <varacanero@zeromail.org> | 2016-10-20 16:30:27 +0200 |
---|---|---|
committer | varac <varacanero@zeromail.org> | 2016-10-20 16:30:27 +0200 |
commit | 09d4a5de6d7a9e05b85db4a410e9572b7e9408e2 (patch) | |
tree | 1cb5cd1441cd547b51da754e70adc1a761ad67ee /puppet/modules/soledad/templates/default-soledad.erb | |
parent | dc2de6b3a666dc5b3692a32ab8ce16afd23a6ee7 (diff) | |
parent | 0b279d8a66293bdf5fe20a77b557055a95a66a46 (diff) |
Merge branch 'soledad_ordering' into develop
Diffstat (limited to 'puppet/modules/soledad/templates/default-soledad.erb')
0 files changed, 0 insertions, 0 deletions