ariel- 60e04b7f85 Merge remote-tracking branch 'tc/3.3.5' into 4.3.4 ...

Conflicts:
	sql/updates/world/2016_01_23_00_world.sql
	sql/updates/world/2016_01_24_00_world.sql
	src/server/game/Entities/Unit/Unit.cpp
	src/server/scripts/Spells/spell_paladin.cpp

2016-01-24 16:00:06 -03:00

..

auth

Merge remote-tracking branch 'tc/3.3.5' into 4.3.4

2016-01-15 00:15:35 -03:00

characters

Merge remote-tracking branch 'tc/3.3.5' into 4.3.4

2016-01-15 00:15:35 -03:00

world

Merge remote-tracking branch 'tc/3.3.5' into 4.3.4

2016-01-24 16:00:06 -03:00