Merge main into develop to resolve conflicts before 1.2.2 release PR

Browse Source

# Conflicts:
#	AppImage/ProxMenux-Monitor.AppImage.sha256
#	LICENSE
#	install_proxmenux_beta.sh

...

This commit is contained in:

MacRimi

2026-05-31 13:24:58 +02:00

parent 9e8434a16b f2f48376d7

commit 964f2083b6

6 changed files with 4767 additions and 1445 deletions

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

AppImage/ProxMenux-1.2.0.AppImage

Executable

BIN

Binary file not shown.