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

# Conflicts: # src/mesh/NodeDB.cpp
2021-03-27 11:10:47 +08:00
parent 8ffd5a1d4f f1a6693bb7
commit 37ec969f96
7 changed files with 83 additions and 112 deletions
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -23,6 +23,7 @@

 #ifndef NO_ESP32
 #include "mesh/http/WiFiAPClient.h"
+#include "plugins/esp32/StoreForwardPlugin.h"
 #endif

 NodeDB nodeDB;