mirror of
https://github.com/MacRimi/ProxMenux.git
synced 2026-11-01 10:22:08 +00:00
Merge remote-tracking branch 'origin/develop' into develop
# Conflicts: # AppImage/messages/de/common.json # AppImage/messages/es/common.json # AppImage/messages/fr/common.json # AppImage/messages/it/common.json # AppImage/messages/pt/common.json # AppImage/messages/sv/common.json
This commit is contained in: