CSEC_PUBLIC/securityonion
1
0
Fork 0
mirror of https://github.com/Security-Onion-Solutions/securityonion.git synced 2025-12-09 18:52:52 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
8b146aac329d53f8af3df93e0229bae0e60f30a0
securityonion/salt/nginx/etc
History
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
..
nginx.conf
Merge branch 'dev' into feature/nginx-update
2020-07-10 17:49:34 -04:00