andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-09-15 14:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged changes for the new dev

Browse Source
This commit is contained in:
Glenn Arens
2019-04-05 12:01:13 +02:00
parent bf5165f446 b31f3118d1
commit 36494d9e6b
20 changed files with 1939 additions and 949 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5
View File
@@ -6,4 +6,9 @@
platformio.ini
lib/readme.txt
.travis.yml
<<<<<<< HEAD
*.py
=======
stackdmp.txt
*.jar
>>>>>>> upstream/dev