diff --git a/dj_elastictranscoder/__init__.py b/dj_elastictranscoder/__init__.py index ecc0ae4..4033697 100644 --- a/dj_elastictranscoder/__init__.py +++ b/dj_elastictranscoder/__init__.py @@ -1 +1 @@ -__version__ = '0.9.3' +__version__ = '0.9.4' diff --git a/dj_elastictranscoder/models.py b/dj_elastictranscoder/models.py index ee35afc..8920e04 100644 --- a/dj_elastictranscoder/models.py +++ b/dj_elastictranscoder/models.py @@ -1,6 +1,10 @@ from django.db import models from django.contrib.contenttypes.models import ContentType -from django.contrib.contenttypes.generic import GenericForeignKey +import django +if django.get_version() > '1.8': + from django.contrib.contenttypes.fields import GenericForeignKey +else: + from django.contrib.contenttypes.generic import GenericForeignKey class EncodeJob(models.Model):