Merge upstream/main into feat/cctv-a22-autobrennero

Browse Source

Resolve conflicts with the NYC, Toronto, Lithuania, Florida, Taiwan and
Kartverket work on main. The CHANGELOG entry moves to
changelog.d/956-a22-brennero-webcams.md, as main now asks.

...

This commit is contained in:

Said Turksever committed 2026-10-30 14:50:41 +00:00

2 parents 1490f37e1b 423ca3ca5f

commit 38302a27a4

1369 files changed

+189595 -25591

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

server/providers/cctv/sources.js

+1829 -47

File diff suppressed because it is too large. Load diff