Conflicts: django/core/management/commands/flush.py django/core/management/commands/syncdb.py django/db/models/loading.py docs/internals/deprecation.txt docs/ref/django-admin.txt docs/releases/1.7.txt |
||
---|---|---|
.. | ||
bin | ||
conf | ||
contrib | ||
core | ||
db | ||
dispatch | ||
forms | ||
http | ||
middleware | ||
shortcuts | ||
template | ||
templatetags | ||
test | ||
utils | ||
views | ||
__init__.py |