Conflicts: polymorphic/tests.py |
||
|---|---|---|
| .. | ||
| locale | ||
| templates/admin/polymorphic | ||
| templatetags | ||
| __init__.py | ||
| __version__.py | ||
| admin.py | ||
| base.py | ||
| manager.py | ||
| models.py | ||
| polymorphic_model.py | ||
| query.py | ||
| query_translate.py | ||
| showfields.py | ||
| tests.py | ||
| tools_for_tests.py | ||
Conflicts: polymorphic/tests.py |
||
|---|---|---|
| .. | ||
| locale | ||
| templates/admin/polymorphic | ||
| templatetags | ||
| __init__.py | ||
| __version__.py | ||
| admin.py | ||
| base.py | ||
| manager.py | ||
| models.py | ||
| polymorphic_model.py | ||
| query.py | ||
| query_translate.py | ||
| showfields.py | ||
| tests.py | ||
| tools_for_tests.py | ||