Jonáš Havelka b6d22d2a3b Merge branch 'develop' into unsafe_develop ... # Conflicts: # seminar/models.py		2021-11-07 08:35:54 +01:00
..
detail.html	Merge branch 'develop' into unsafe_develop	2021-11-07 08:35:54 +01:00
nahraj_reseni.html	Move odevzdavatko do aplikace odevzdavatko	2021-10-13 09:07:25 +02:00
posli_reseni.html	Move odevzdavatko do aplikace odevzdavatko	2021-10-13 09:07:25 +02:00
prehled_reseni.html	Move odevzdavatko do aplikace odevzdavatko	2021-10-13 09:07:25 +02:00
seznam.html	Move odevzdavatko do aplikace odevzdavatko	2021-10-13 09:07:25 +02:00
tabulka.html	Merge branch 'develop' into unsafe_develop	2021-11-07 08:35:54 +01:00