Merge branch 'master' into noprints

Browse Source

# Conflicts:
#	src/Heating.cpp
#	src/main.cpp

...

This commit is contained in:

lukas 2021-03-31 17:50:29 +02:00

parent 3a5f1a3a74 9c782879a5

commit 5cfd78f942

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available