# Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # note_kfet/settings/base.py # templates/base.html |
||
|---|---|---|
| .. | ||
| cas_server | ||
| django_filters | ||
| member | ||
| note | ||
| registration | ||
| treasury | ||
| base.html | ||
# Conflicts: # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # note_kfet/settings/base.py # templates/base.html |
||
|---|---|---|
| .. | ||
| cas_server | ||
| django_filters | ||
| member | ||
| note | ||
| registration | ||
| treasury | ||
| base.html | ||