mirror of
https://github.com/vcmi/vcmi.git
synced 2025-01-26 03:52:01 +02:00
03c3fa9e1a
# Conflicts: # client/CServerHandler.cpp # lib/serializer/Connection.cpp # lib/serializer/Connection.h # server/CVCMIServer.cpp