Merge branch 'master' into ft_user_security

This commit is contained in:
Rick Watson 2019-04-30 00:30:54 +01:00
commit a05129be38
2 changed files with 2 additions and 2 deletions

View File

@ -88,7 +88,7 @@ protected:
public:
SettingsPersistence(FS* fs, char const* servicePath, char const* filePath):
SettingsPersistence(FS* fs, char const* filePath):
_fs(fs), _filePath(filePath) {}
virtual ~SettingsPersistence() {}

View File

@ -60,7 +60,7 @@ private:
public:
SettingsService(AsyncWebServer* server, FS* fs, char const* servicePath, char const* filePath):
SettingsPersistence(fs, servicePath, filePath), _server(server) {
SettingsPersistence(fs, filePath), _server(server) {
// configure fetch config handler
_server->on(servicePath, HTTP_GET, std::bind(&SettingsService::fetchConfig, this, std::placeholders::_1));