aboutsummaryrefslogtreecommitdiff
path: root/src/serverdata.h
AgeCommit message (Expand)Author
2024-05-17Resolved merge conflicts.TrickyLeifa
2024-05-17Merge branch 'master' into kaleidoscopeTrickyLeifa