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
..
before_install.sh	Merge branch 'develop' into handlersAbstraction	2021-07-16 00:32:13 +03:00
upload_package.sh	Travis CI: update config and upload artifacts after build	2017-06-13 20:32:43 +03:00