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
316663807862ad2a4a24edbe8c2e508715d02cdc
TrinityCore/sql
History
Vincent-Michael 3166638078 Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4 
Conflicts:
	src/server/game/Entities/Player/Player.cpp
	src/server/game/Guilds/Guild.cpp
	src/server/game/Spells/Auras/SpellAuraEffects.cpp
	src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.cpp
2013-08-28 19:24:01 +02:00
..
base
Merge remote-tracking branch 'origin/master' into 4.3.4
2013-08-25 14:12:32 +01:00
create
…
old
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-09 20:02:21 +02:00
updates
Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.3.4
2013-08-28 19:24:01 +02:00