tree a60c040d0451c1fb71124186cd1d3e1d20cbea5f
parent 515356fe8cf28500716fd2905258dbc2ac9e3655
parent 8b92d55fda49b323b6fad6e866be3a5728cca42c
author Cedric HNYDA <ced.hnyda@gmail.com> 1511955198 +0100
committer GitHub <noreply@github.com> 1511955198 +0100
gpgsig -----BEGIN PGP SIGNATURE-----
 
 wsBcBAABCAAQBQJaHpr+CRBK7hj4Ov3rIwAAdHIIACDJaREWuFQB1Mxlzs7xbak/
 0rXJuGczgrSVP1hE9nJRc/POI1R7YT/iFijCki21BXQ9UB3Ef3Lbedxz143Al1yj
 Nj10saQPmBTvzkQsE5r6O/b0RAvLhOhdy0GM0p94gjqzQ/Ip5SavS1VFDg4W0l8b
 yjFeIi/0Y31gLc/1+fjSOy86iJ7IjHacRIyyCC2rB9r3ymLuM/PIfOthd/2p6KyI
 62gXNAvgcHZW91H473V5k4RN7ocI7njDKrISmF/WIoHw3GzcASeL8MVbZdP0uMNx
 saDNHeQCw28kyb4qBCQPNGtB6WYFfnGDmxZJLmK7wU+mBTkmrwlg4V5nG4VtOHA=
 =DTsU
 -----END PGP SIGNATURE-----
 

Merge pull request #28 from salt-formulas/merge-bootstrap-states

merge .env and .pillar states