Jonáš Havelka 446515a52e Merge branch 'master' into predelani_sousovych_view ... # Conflicts: # soustredeni/views.py # various/views/generic.py		2024-10-24 11:44:04 +02:00
..
soustredeni	Merge branch 'master' into predelani_sousovych_view	2024-10-24 11:44:04 +02:00