Simon Kellner 739a7120f9 Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren' ... # Conflicts: # GoldWars/GoldWars.xcodeproj/project.pbxproj		2020-05-20 16:33:37 +00:00
..
.idea	Merge branch '60-global-accessible-entitymanager'	2020-05-17 21:43:41 +02:00
GoldWars	Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren'	2020-05-20 16:33:37 +00:00
GoldWars.xcodeproj	Merge branch 'development' into '56-attack-boost-faehigkeit-implementieren'	2020-05-20 16:33:37 +00:00
GoldWarsTests	Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"	2020-05-11 19:58:15 +02:00