Niko Jochim 66aa21ccb4 Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'		2020-07-02 12:54:22 +02:00
..
.idea	Merge branch '60-global-accessible-entitymanager'	2020-05-17 21:43:41 +02:00
GoldWars	Merge remote-tracking branch 'refs/remotes/origin/devTestBranch'	2020-07-02 12:54:22 +02:00
GoldWars.xcodeproj	Merge branch 'development' into 89-regelwerk	2020-06-25 19:28:15 +02:00
GoldWarsTests	Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"	2020-05-11 19:58:15 +02:00