Merge branch 'development' of https://github.com/arendst/Tasmota into development

This commit is contained in:
Theo Arends 2020-04-19 16:58:29 +02:00
commit 0674bcc1ad
1 changed files with 2 additions and 1 deletions

3
.gitignore vendored
View File

@ -17,6 +17,7 @@ tasmota*.bin
tasmota*.bin.gz tasmota*.bin.gz
tasmota*.map tasmota*.map
platformio_override.ini platformio_override.ini
platformio_tasmota_cenv.ini
## Visual Studio Code specific ###### ## Visual Studio Code specific ######
.vscode .vscode
@ -24,4 +25,4 @@ platformio_override.ini
.vscode/c_cpp_properties.json .vscode/c_cpp_properties.json
.vscode/launch.json .vscode/launch.json
*.bak *.bak
*.code-workspace *.code-workspace