Merge branch 'master' into set-retry-after

Conflicts:
	tests/test_throttling.py

1 files changed, 8 insertions, 0 deletions

diff --git a/tests/accounts/models.py b/tests/accounts/models.py
new file mode 100644
index 00000000..3bf4a0c3
--- /dev/null
+++ b/tests/accounts/models.py
@@ -0,0 +1,8 @@
+from django.db import models
+
+from tests.users.models import User
+
+
+class Account(models.Model):
+    owner = models.ForeignKey(User, related_name='accounts_owned')
+    admins = models.ManyToManyField(User, blank=True, null=True, related_name='accounts_administered')