Kevin Hester 3f401e8cac Merge branch 'dev' into portduino ...

# Conflicts:
#	.vscode/settings.json

2021-03-15 12:09:07 +08:00

..

extensions.json

…

settings.json

Merge branch 'dev' into portduino

2021-03-15 12:09:07 +08:00

tasks.json

…