Merge pull request #1302 from LLK/issue/scratchr2/1460

Issue/scratchr2/1460
This commit is contained in:
Ray Schamp 2014-05-06 09:10:52 -04:00
commit a872e00b52

View file

@ -11,7 +11,7 @@ from hashlib import sha1
from django.db.models import OneToOneField
from django.db.models.fields.related import SingleRelatedObjectDescriptor
from django.db import models
from django.db import models, IntegrityError
from django.core.files.uploadedfile import SimpleUploadedFile
from django.core.serializers.json import DjangoJSONEncoder
from django.utils import simplejson as json