github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-15 19:19:33 +00:00
Code Issues Projects Releases Packages Wiki Activity
mage/Mage.Sets
History
LevelX2 f66834fc19 Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/Cacophodon.java
	Mage.Sets/src/mage/cards/g/GiltgroveStalker.java
	Mage.Sets/src/mage/cards/h/HardyVeteran.java
	Mage.Sets/src/mage/sets/RivalsOfIxalan.java
2018-01-06 12:48:35 +01:00
..
src/mage Merge origin/master 2018-01-06 12:48:35 +01:00
pom.xml