mirror of
https://github.com/EQEmu/Server.git
synced 2026-10-08 13:43:35 +00:00
Fix merge [skip ci]
This commit is contained in:
1 parent
b15ada974f
commit
b04844aa94
1 file changed
-1
@@ -76,7 +76,6 @@ mackal: Instant spells now have instrument mods
|
||||
mackal: Rate limit character saves
|
||||
mackal: Made it so items no longer do TGB (Live-like) Rule implemented to disable
|
||||
mackal: Set pet buffs limit to 30
|
||||
>>>>>>> upstream/master
|
||||
|
||||
== 09/03/2016 ==
|
||||
Uleat: Changed 'Bind Wound' behavior to match the best references that I could find for post-2004 era.
|
||||
|
||||
Reference in new issue
Block a user