Merge branch 'master' into set-retry-after

Conflicts:
	tests/test_throttling.py

3 files changed, 0 insertions, 19 deletions

diff --git a/rest_framework/tests/accounts/__init__.py b/rest_framework/tests/accounts/__init__.py
deleted file mode 100644
index e69de29b..00000000
--- a/rest_framework/tests/accounts/__init__.py
+++ /dev/null
diff --git a/rest_framework/tests/accounts/models.py b/rest_framework/tests/accounts/models.py
deleted file mode 100644
index 525e601b..00000000
--- a/rest_framework/tests/accounts/models.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.db import models
-
-from rest_framework.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')
diff --git a/rest_framework/tests/accounts/serializers.py b/rest_framework/tests/accounts/serializers.py
deleted file mode 100644
index a27b9ca6..00000000
--- a/rest_framework/tests/accounts/serializers.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from rest_framework import serializers
-
-from rest_framework.tests.accounts.models import Account
-from rest_framework.tests.users.serializers import UserSerializer
-
-
-class AccountSerializer(serializers.ModelSerializer):
-    admins = UserSerializer(many=True)
-
-    class Meta:
-        model = Account