1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-01-18 03:21:27 +02:00
Andrii Danylchenko 9c8d776398 Merge branch 'develop' into handlersAbstraction
# Conflicts:
#	CI/linux/before_install.sh
#	CI/mac/before_install.sh
#	CI/mxe/before_install.sh
#	lib/CModHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.cpp
#	lib/mapObjects/CObjectClassesHandler.h
#	lib/mapObjects/CommonConstructors.cpp
#	server/CGameHandler.cpp
#	test/CMakeLists.txt
#	test/spells/effects/TeleportTest.cpp
2021-07-16 00:32:13 +03:00
..
2020-10-04 02:20:18 -07:00
2020-10-04 02:20:18 -07:00
2021-02-15 15:03:32 +03:00
2021-02-20 04:57:50 +03:00
2020-10-04 02:20:18 -07:00
2018-07-25 01:36:48 +03:00
2019-06-06 22:56:14 +02:00