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-19 11:47:00 -08:00
2020-08-31 13:01:05 -07:00
2021-01-04 15:36:18 -08:00
2020-12-25 16:08:10 -08:00
2020-12-24 13:50:29 -08:00
2020-12-26 13:24:45 -06:00
2020-12-24 13:50:29 -08:00
2020-06-29 17:31:47 -04:00
2020-12-24 13:50:29 -08:00
2020-12-24 13:50:29 -08:00
2019-03-27 08:47:29 +02:00
2019-07-03 23:35:22 +02:00
2020-12-24 13:50:29 -08:00
2020-08-20 22:14:59 +02:00
2020-12-24 13:50:29 -08:00