Berry Langerak cfbc2910ed Fixing merge conflict.

2014-10-06 11:43:45 +02:00

..

init.sls

Fixing merge conflict.

2014-10-06 11:43:45 +02:00

map.jinja

Fixing merge conflict.

2014-10-06 11:43:45 +02:00

pg_hba.conf

Added support for multiple databases/users

2014-07-27 22:04:57 -04:00

python.sls

corrected python state to match map.jinja

2014-02-27 11:53:05 -05:00