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

2.4 KiB

Raw Blame History

View Raw