Khopa cf583bcd55 Merge branch 'master' into develop
# Conflicts:
#	changelog.md
#	game/db.py
#	game/game.py
#	game/income.py
#	game/theater/theatergroundobject.py
#	game/version.py
#	qt_ui/windows/finances/QFinancesMenu.py
2021-01-05 19:50:29 +01:00
..
2020-12-28 10:52:25 -06:00
2020-11-17 18:11:33 -08:00
2020-10-06 22:24:47 -07:00
2020-10-06 23:31:40 -07:00
2021-01-04 15:57:37 -08:00