Merge remote-tracking branch 'ul/dev' into mntm-dev

Browse Source

# Conflicts:
#	applications/main/infrared/resources/infrared/assets/tv.ir

...

This commit is contained in:

Willy-JL

2024-07-17 22:10:21 +01:00

parent 0873f3abe8 9dc97807a0

commit 3f95358bb5

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

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

Diff Content Not Available