William Wernert 8b146aac32 Merge branch 'dev' into feature/nginx-update ...

# Conflicts:
#	salt/nginx/etc/nginx.conf
#	salt/nginx/etc/nginx.conf.so-eval
#	salt/nginx/etc/nginx.conf.so-manager
#	salt/nginx/etc/nginx.conf.so-managersearch
#	salt/nginx/etc/nginx.conf.so-mastersearch
#	salt/nginx/etc/nginx.conf.so-standalone

2020-07-10 17:49:34 -04:00

..

etc

Merge branch 'dev' into feature/nginx-update

2020-07-10 17:49:34 -04:00

files

https://github.com/Security-Onion-Solutions/securityonion/issues/404

2020-07-09 11:27:06 -04:00

html

updating nginx index.html - issue/587

2020-04-24 14:24:33 -04:00

init.sls

Merge branch 'dev' into feature/nginx-update

2020-07-10 17:49:34 -04:00