shade/Meshtastic
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'root/master' into dev1.2

Browse Source 
# Conflicts:
#	src/mesh/NodeDB.cpp
This commit is contained in:
Kevin Hester committed 2021-03-27 11:10:47 +08:00
2 parents 8ffd5a1d4f f1a6693bb7
commit 37ec969f96
7 files changed
+83 -112
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/mesh/NodeDB.cpp
+1
View File
@@ -23,6 +23,7 @@
#ifndef NO_ESP32
#include "mesh/http/WiFiAPClient.h"
#include "plugins/esp32/StoreForwardPlugin.h"
#endif
NodeDB nodeDB;