# Conflicts: # server/core/settings.py # server/core/urls.py # server/core/views.py |
||
|---|---|---|
| .. | ||
| registration | ||
| wagtailadmin | ||
| base.html | ||
| confirmation_key.html | ||
| generic_page.html | ||
# Conflicts: # server/core/settings.py # server/core/urls.py # server/core/views.py |
||
|---|---|---|
| .. | ||
| registration | ||
| wagtailadmin | ||
| base.html | ||
| confirmation_key.html | ||
| generic_page.html | ||