Mirror/TrinityCore
1
0
Fork 0
mirror of https://github.com/TrinityCore/TrinityCore.git synced 2026-01-18 00:18:43 +01:00
Code Issues Packages Projects Releases Wiki Activity
Files
ef5bc9c70a6b50e1244a91fb922ecab455f6966f
TrinityCore/sql/updates
History
Vincent-Michael ef5bc9c70a Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Player/Player.h
	src/server/game/Guilds/Guild.cpp
	src/server/game/Handlers/TradeHandler.cpp
	src/server/scripts/Commands/cs_modify.cpp
	src/server/scripts/Kalimdor/zone_durotar.cpp
2014-05-18 19:40:30 +02:00
..
auth
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-04-28 23:00:41 +02:00
characters
DB/Seasonal:
2014-04-30 01:40:53 +02:00
world
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2014-05-18 19:40:30 +02:00