Skip to content
Snippets Groups Projects
Commit 514feca2 authored by Dinya Gergely's avatar Dinya Gergely
Browse files

Merge branch 'master' into 'STP-999-Balancing' 

# Conflicts:
#   GameModel/Application.cs
#   GamePersistence/GameInfo.cs
#   UnitTests/BuildingTest.cs
#   UnitTests/MiscTest.cs
#   UnitTests/SatisfactionTest.cs
parents 1ecb1d47 a9f733ff
No related branches found
No related tags found
Checking pipeline status
Hide whitespace changes
Inline Side-by-side
Showing
with 222 additions and 329 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment