mage/Mage
Alex Vasile b3bf42389b Merge branch 'master' into fix_hints_equip
# Conflicts:
#	Mage.Sets/src/mage/cards/b/BehemothSledge.java
#	Mage.Sets/src/mage/cards/d/DivinersWand.java
#	Mage.Sets/src/mage/cards/u/UmbralMantle.java
#	Mage.Sets/src/mage/cards/u/UnscytheKillerOfKings.java
#	Mage.Sets/src/mage/cards/w/WandOfOrcus.java
#	Mage/src/main/java/mage/abilities/keyword/EquipAbility.java
2022-05-12 08:12:25 -06:00
..
src Merge branch 'master' into fix_hints_equip 2022-05-12 08:12:25 -06:00
pom.xml Dev: downgraded protobuf lib for build compatibility (fix #8575); 2022-01-22 00:10:18 +04:00