Permalink
Browse files

Merge branch 'release/v0.4.3'

  • Loading branch information...
2 parents 5cd7c1d + c63e8c4 commit 7a5e9ccb27853f3c719ad3d7d213ddd6331a6105 @RyanBalfanz committed Mar 27, 2012
Showing with 11 additions and 3 deletions.
  1. +1 −1 sendgrid/__init__.py
  2. +10 −2 sendgrid/models.py
View
@@ -1,6 +1,6 @@
"""django-sendgrid"""
-VERSION = (0, 4, 2)
+VERSION = (0, 4, 3)
__version__ = ".".join(map(str, VERSION[0:3])) + "".join(VERSION[3:])
__author__ = "Ryan Balfanz"
View
@@ -1,3 +1,11 @@
-from django.db import models
+from __future__ import absolute_import
-# Create your models here.
+from django.conf import settings
+from django.contrib.auth.models import User
+
+
+SENDGRID_USER_MIXIN_ENABLED = getattr(settings, "SENDGRID_USER_MIXIN_ENABLED", True)
+
+if SENDGRID_USER_MIXIN_ENABLED:
+ from .mixins import SendGridUserMixin
+ User.__bases__ += (SendGridUserMixin,)

0 comments on commit 7a5e9cc

Please sign in to comment.