William Wernert 42e285cfbe 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-standalone

2020-10-19 13:25:46 -04:00

..

etc

Merge branch 'dev' into feature/nginx-update

2020-10-19 13:25:46 -04:00

files

change reference from manager:url_base to global:url_base - https://github.com/Security-Onion-Solutions/securityonion/issues/1039

2020-08-14 17:55:30 -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-10-19 13:25:46 -04:00