Andrew Godwin de64c4d6e9 Merge remote-tracking branch 'core/master' into schema-alteration ... 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		2013-08-09 14:17:30 +01:00
..
locale	Updated translation templates and removed en translations	2013-05-02 16:25:23 +02:00
__init__.py	MERGED MAGIC-REMOVAL BRANCH TO TRUNK. This change is highly backwards-incompatible. Please read http://code.djangoproject.com/wiki/RemovingTheMagic for upgrade instructions.	2006-05-02 01:31:56 +00:00
generic.py	Fixed #18681 -- GenericInlineModelAdmin.get_formset() no longer bypasses get_fieldsets().	2013-08-02 10:41:29 -04:00
management.py	Rename allow_syncdb to allow_migrate	2013-07-30 12:08:59 +01:00
models.py	(Re-)moved some imports	2013-05-21 17:34:19 +02:00
tests.py	Fix NoneType error when fetching a stale ContentType with get_for_id	2013-05-18 17:31:28 +02:00
views.py	Replaced an antiquated pattern.	2013-05-17 18:08:58 +02:00