External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
mage/Mage.Server.Console
History
betasteward d9f1d71d98 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/view/CardView.java
2015-08-17 09:20:44 -04:00
..
src Merge branch 'master' into Network_Upgrade 2015-07-12 12:25:44 -04:00
pom.xml Merge branch 'master' into Network_Upgrade 2015-08-17 09:20:44 -04:00