Merge remote-tracking branch 'origin/main' into sprint-37/server

Browse Source

# Conflicts:
#	CHANGELOG.md
#	Makefile
#	server/data/systems.db

...

This commit is contained in:

jpmschweitzer

2026-04-22 09:01:43 +02:00

parent f8407980db 5b68c4ce80

commit 94a687fc08

15 changed files with 827 additions and 12 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

server/data/systems.db

BIN

Binary file not shown.