Commit Graph

4 Commits

Author SHA1 Message Date
Ovahlord
98fdf72c7b Merge branch '4.3.4' of https://gitlab.com/trinitycore/TrinityCore_434 into ShatteredWorld
# Conflicts:
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
#	src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
2018-01-02 01:23:06 +01:00
Aokromes
4bd0525edd Update copyright note for 2018 2018-01-01 01:06:19 +01:00
Ovalord
be1615d5f4 Core/Guilds: implement Guild Challenges 2017-12-21 19:44:57 +01:00
Aokromes
5e1a7bcfbb Core/Misc: Moved CharacterInfo out of world to separate class 2017-10-27 17:52:30 +02:00