| commit | 327c4d15ce56a8552f23b8c90e2798357df2f7be | [log] [tgz] |
|---|---|---|
| author | Cedric HNYDA <ced.hnyda@gmail.com> | Wed Nov 29 12:33:18 2017 +0100 |
| committer | GitHub <noreply@github.com> | Wed Nov 29 12:33:18 2017 +0100 |
| tree | a60c040d0451c1fb71124186cd1d3e1d20cbea5f | |
| parent | 515356fe8cf28500716fd2905258dbc2ac9e3655 [diff] | |
| parent | 8b92d55fda49b323b6fad6e866be3a5728cca42c [diff] |
Merge pull request #28 from salt-formulas/merge-bootstrap-states merge .env and .pillar states