mage/Mage.Client/src/main/java
North 96ff08dc9a Merge branch 'decouple-client'
Conflicts:
	Mage/src/mage/cards/repository/CardRepository.java
2013-07-03 21:42:40 +03:00
..
mage Merge branch 'decouple-client' 2013-07-03 21:42:40 +03:00
org/mage Merge remote-tracking branch 'origin/master' into decouple-client 2013-06-30 11:26:40 +03:00