foul-magics/Mage.Server/src/main/java/mage
North 96ff08dc9a Merge branch 'decouple-client'
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
2013-07-03 21:42:40 +03:00
..
server Merge branch 'decouple-client' 2013-07-03 21:42:40 +03:00