Jonáš Havelka f5570bdf6b Merge branch 'unsafe_develop' into develop ... # Conflicts: # odevzdavatko/views.py # seminar/admin.py # seminar/models.py # seminar/templates/seminar/archiv/cislo-normal.html # seminar/urls.py		2021-11-22 20:06:01 +01:00
..
seminar	Merge branch 'unsafe_develop' into develop	2021-11-22 20:06:01 +01:00