Merge remote-tracking branch 'origin/dev' into dev

Browse Source

# Conflicts:
#	src/_icons/outlet.svg
#	src/_icons/plug.svg

...

This commit is contained in:

codecalm 2020-04-20 07:23:21 +02:00

parent d18d9c4760 b063aece7f

commit 0ec9c155c1

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