mirror of
https://github.com/blakeblackshear/frigate.git
synced 2026-11-19 20:13:01 +03:00
Merge remote-tracking branch 'origin/master' into dev
Conflict resolutions: - Makefile: keep dev's VERSION 0.19.0 - docker/main/build_nginx.sh: take master's NGINX_VERSION 1.30.7 (CVE fix) - docker/main/rootfs/usr/local/nginx/conf/nginx.conf: take dev's side, which already contains everything #25009 adds Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
@@ -2,7 +2,7 @@
|
||||
|
||||
set -euxo pipefail
|
||||
|
||||
NGINX_VERSION="1.27.4"
|
||||
NGINX_VERSION="1.30.7"
|
||||
VOD_MODULE_VERSION="v1.9.1"
|
||||
SET_MISC_MODULE_VERSION="v0.33"
|
||||
NGX_DEVEL_KIT_VERSION="v0.3.3"
|
||||
|
||||
Reference in New Issue
Block a user