Merge branch 'fz-dev'

Conflicts:
	.gitmodules
	firmware/targets/f7/api_symbols.csv
This commit is contained in:
MX
2022-10-20 19:06:56 +03:00
32 changed files with 3036 additions and 22 deletions

3
.gitmodules vendored
View File

@@ -34,3 +34,6 @@
[submodule "applications/plugins/subbrute"]
path = applications/plugins/subbrute
url = https://github.com/derskythe/flipperzero-subbrute.git
[submodule "applications/plugins/dap_link/lib/free-dap"]
path = applications/plugins/dap_link/lib/free-dap
url = https://github.com/ataradov/free-dap.git