mamweb/odevzdavatko
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
..
migrations Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
static/odevzdavatko Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
templates/odevzdavatko Merge branch 'unsafe_develop' into develop 2021-11-22 20:06:01 +01:00
__init__.py Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
admin.py Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
apps.py Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
forms.py Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
urls.py Move odevzdavatko do aplikace odevzdavatko 2021-10-13 09:07:25 +02:00
views.py Merge branch 'unsafe_develop' into develop 2021-11-22 20:06:01 +01:00