Merge main into develop to resolve conflicts before 1.2.2 release PR

# 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
6 changed files with 4767 additions and 1445 deletions
+1 -1
View File
@@ -1567,4 +1567,4 @@ main() {
if [[ "${BASH_SOURCE[0]}" == "$0" ]]; then
main
fi
fi