Jonáš Havelka b6d22d2a3b Merge branch 'develop' into unsafe_develop ... # Conflicts: # seminar/models.py		2021-11-07 08:35:54 +01:00
..
odevzdavatko	Merge branch 'develop' into unsafe_develop	2021-11-07 08:35:54 +01:00