Merge branch 'ofw_dev'

Conflicts:
	.gitmodules
	ReadMe.md
This commit is contained in:
MX 2024-03-10 23:38:56 +03:00
commit 175f603678
No known key found for this signature in database
GPG Key ID: 7CCC66B7DBDD1C83

2
.gitmodules vendored
View File

@ -41,4 +41,4 @@
[submodule "subghz_remote"] [submodule "subghz_remote"]
path = applications/main/subghz_remote path = applications/main/subghz_remote
url = https://github.com/DarkFlippers/SubGHz_Remote.git url = https://github.com/DarkFlippers/SubGHz_Remote.git
branch = ufw_main_app branch = ufw_main_app