| # Conflicts: # odevzdavatko/views.py # seminar/admin.py # seminar/models.py # seminar/templates/seminar/archiv/cislo-normal.html # seminar/urls.py | ||
|---|---|---|
| .. | ||
| __init__.py | ||
| docasne.py | ||
| views_all.py | ||
| # Conflicts: # odevzdavatko/views.py # seminar/admin.py # seminar/models.py # seminar/templates/seminar/archiv/cislo-normal.html # seminar/urls.py | ||
|---|---|---|
| .. | ||
| __init__.py | ||
| docasne.py | ||
| views_all.py | ||