Carbenium
82ea8da720
Merge commit '44959aeedddb552c50bf9ff06a2685d216844f24' into 4.3.4
Conflicts:
.travis.yml
README.md
sql/updates/world/2015_04_18_00_world.sql
sql/updates/world/2015_04_18_05_world_335.sql
sql/updates/world/2015_04_26_03_world_335.sql
sql/updates/world/2015_05_09_00_world_335.sql
src/server/game/Conditions/ConditionMgr.h
src/server/game/Entities/GameObject/GameObject.cpp
src/server/game/Entities/GameObject/GameObject.h
src/server/game/Entities/Player/Player.cpp
src/server/game/Entities/Unit/Unit.cpp
src/server/game/Spells/SpellInfo.cpp
2015-07-22 01:33:48 +02:00
..
2014-09-28 12:03:34 +02:00
2015-07-22 01:33:48 +02:00
2015-04-15 19:29:37 +02:00
2015-07-19 13:37:44 +02:00
2015-07-19 14:13:38 +02:00
2015-03-29 16:08:28 +02:00
2014-08-27 23:22:16 +02:00