4 commits

Author	SHA1	Message	Date
Jonáš Havelka	bea7399fe2	Fix merge	2021-11-22 20:11:50 +01:00
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
Jonáš Havelka	b6d22d2a3b	Merge branch 'develop' into unsafe_develop ... # Conflicts: # seminar/models.py	2021-11-07 08:35:54 +01:00
Jonáš Havelka	ef68d3fb75	Move odevzdavatko do aplikace odevzdavatko	2021-10-13 09:07:25 +02:00