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
..
__init__.py	Merged the gis branch into trunk.	2008-08-05 18:13:06 +00:00
models.py	Fixed #18367 -- Allowed LayerMapping to store strings in TextField.	2012-05-24 09:57:22 +02:00
tests.py	Merge remote-tracking branch 'core/master' into schema-alteration	2013-08-09 14:17:30 +01:00