Aldin Duraki 26b3b13459 Merge branch '82-status-eines-jeweiligen-settings-sollte-in-den-settings-erkennbar-sein' into 'development' ...

Resolve "Status eines jeweiligen Settings sollte in den Settings erkennbar sein"

Closes #82

See merge request marcel.schwarz/software-projekt-2!132

2020-06-25 12:44:52 +00:00

..

.idea

Merge branch '60-global-accessible-entitymanager'

2020-05-17 21:43:41 +02:00

GoldWars

Merge branch '82-status-eines-jeweiligen-settings-sollte-in-den-settings-erkennbar-sein' into 'development'

2020-06-25 12:44:52 +00:00

GoldWars.xcodeproj

delete unessecary files

2020-06-25 14:42:23 +02:00

GoldWarsTests

Revert "Merge branch '33-basisownership-anhand-des-gkplayers' into 'development'"

2020-05-11 19:58:15 +02:00