administrator/frigate
1
0
Fork 0
mirror of https://github.com/blakeblackshear/frigate.git synced 2026-04-27 17:17:40 +03:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Merge branch 'dev' into testbranch_Shuba

Browse Source
This commit is contained in:
Shuba shwetha 2025-08-19 23:50:23 -04:00 committed by GitHub
commit 1f6b5ee4db
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
README.md
View File

@ -67,4 +67,9 @@ We use [Weblate](https://hosted.weblate.org/projects/frigate-nvr/) to support la
<img src="https://hosted.weblate.org/widget/frigate-nvr/multi-auto.svg" alt="Translation status" />
</a>
Conflict while merging for sure!
Conflict while merging for sure!
Adding this line just to create a conflict with testbranch_Shuba