# Conflicts: # apps/activity/views.py # apps/permission/backends.py # locale/de/LC_MESSAGES/django.po # locale/fr/LC_MESSAGES/django.po # static/js/base.js # templates/base.html # templates/member/user_list.html |
||
|---|---|---|
| .. | ||
| alias.js | ||
| autocomplete_model.js | ||
| base.js | ||
| consos.js | ||
| dynamic-formset.js | ||
| transfer.js | ||