Aldin Duraki 89dc64db27 Merge branch '89-regelwerk' into 'development' ...

Resolve "Regelwerk"

Closes #89

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

2020-06-25 17:36:44 +00:00

..

.idea

Merge branch '60-global-accessible-entitymanager'

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

GoldWars

Merge branch '89-regelwerk' into 'development'

2020-06-25 17:36:44 +00: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