Merge remote-tracking branch 'gskjold/master' into develop

Conflicts:
	.gitignore
	Arduino Code/AmsToMqttBridge/AmsToMqttBridge.ino
	Arduino Code/Arduino Libraries/HanReader/src/Aidon.h
This commit is contained in:
Vegar Westerlund 2019-07-21 17:42:55 +02:00
commit cd02d19722

4
.gitignore vendored
View File

@ -3,5 +3,7 @@
[Rr]elease/
**/__vm/
.DS_Store
*.sw[op]
.vscode
.pio
platformio.ini