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-25 01:35:24 -08:00
2020-11-19 21:09:33 -08:00
2020-11-07 19:20:08 +01:00
2020-12-24 16:09:42 -08:00
2021-01-05 00:26:19 -08:00
2021-01-05 19:50:29 +01:00
2020-12-26 17:26:07 -08:00
2020-09-03 15:02:59 -07:00
2020-12-24 13:50:29 -08:00
2020-12-13 15:41:13 -06:00
2020-08-31 13:01:05 -07:00
2020-11-28 18:43:32 -06:00