Files
forge/forge-game
klaxnek cff4a29f1c Merge branch 'master' of https://git.cardforge.org/core-developers/forge into translation11
 Conflicts:
	forge-gui/res/languages/de-DE.properties
	forge-gui/res/languages/en-US.properties
	forge-gui/res/languages/es-ES.properties
	forge-gui/res/languages/zh-CN.properties
2019-11-16 09:59:06 +01:00
..