summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorAlex Gaynor <alex.gaynor@gmail.com>2010-08-09 21:16:59 +0000
committerAlex Gaynor <alex.gaynor@gmail.com>2010-08-09 21:16:59 +0000
commitc7bd48cb9f645e5ff07d1e68b86130e3bb2b043f (patch)
treea0459672ce695501236fa89879615a2896b42637 /django/db/models/__init__.py
parent9b263c61f805947a06473fd5ca170e8b970aae32 (diff)
[soc2010/query-refactor] Improved the ListField implementation, and added an EmbeddedModelField.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2010/query-refactor@13564 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r--django/db/models/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index 0736648a7b..6c0161a0e9 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -13,7 +13,7 @@ from django.db.models.fields.subclassing import SubfieldBase
from django.db.models.fields.files import FileField, ImageField
from django.db.models.fields.related import (ForeignKey, OneToOneField,
ManyToManyField, ManyToOneRel, ManyToManyRel, OneToOneRel)
-from django.db.models.fields.structures import ListField
+from django.db.models.fields.structures import ListField, EmbeddedModel
from django.db.models import signals
# Admin stages.