Vincent-Michael 0bebf40fe7 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 ...

Conflicts:
	src/server/game/AuctionHouse/AuctionHouseMgr.h
	src/server/game/Entities/Creature/Creature.cpp
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Entities/Unit/StatSystem.cpp
	src/server/game/Entities/Unit/Unit.cpp
	src/server/game/Entities/Vehicle/Vehicle.cpp
	src/server/game/Handlers/NPCHandler.cpp

2013-06-11 22:07:11 +02:00

..

auth

Merge pull request #9854 from Ascathor/master

2013-06-02 17:52:27 -07:00

characters

Core/PacketIO: Implemented possibility to ban client addons serverside

2013-04-05 15:06:35 +02:00

world

Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4

2013-06-11 22:07:11 +02:00