Files
moonwell-core-vanilla/sql/old_migrations
Prithu Parker 6ac0cd1c68 Merge branch 'development' of git@github.com:elysium-project/server.git into release-merge
# Conflicts:
#	sql/migrations/20170929190759_characters.sql
#	src/game/Chat/Chat.cpp
#	src/game/ObjectMgr.cpp
#	src/game/Objects/Creature.cpp
#	src/game/Objects/GameObject.cpp
#	src/game/Objects/Player.cpp
#	src/game/Objects/Unit.cpp
#	src/game/Spells/SpellAuras.cpp
#	src/game/Spells/SpellEffects.cpp
#	src/scripts/world/npcs_special.cpp
2017-10-14 12:41:18 +11:00
..