External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2026-01-09 12:22:10 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
mage/Mage.Tests/src
History
Samuel Sandeen 434be545f7 Merge remote-tracking branch 'magefree/master' 
# Conflicts:
#
Mage/src/main/java/mage/abilities/condition/common/SourceHasSubtypeCondi
tion.java
#	Mage/src/main/java/mage/game/permanent/PermanentToken.java
2016-09-03 20:06:33 -04:00
..
frozen/org/mage/test/clientside Change all line endings to LF 2016-04-14 16:18:01 +00:00
test Merge remote-tracking branch 'magefree/master' 2016-09-03 20:06:33 -04:00