aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/relations.py
diff options
context:
space:
mode:
authorTom Christie2014-10-03 13:12:43 +0100
committerTom Christie2014-10-03 13:12:43 +0100
commit01c0857f8b59137543565bf9a589fe2193725346 (patch)
tree8faeba430e535466ced4404e4157e336f5b09d60 /rest_framework/relations.py
parent765b0b33bf1fa9b7c6b45d3877d10a05d4e9f6ea (diff)
parentdd47d8aa459e5ab12ce7ddf2a6f52fdbd82cec18 (diff)
downloaddjango-rest-framework-01c0857f8b59137543565bf9a589fe2193725346.tar.bz2
Merge branch 'version-3.0' of https://github.com/tomchristie/django-rest-framework into version-3.0
Diffstat (limited to 'rest_framework/relations.py')
-rw-r--r--rest_framework/relations.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py
index f9b5ff0d..e5bdf60c 100644
--- a/rest_framework/relations.py
+++ b/rest_framework/relations.py
@@ -100,9 +100,9 @@ class HyperlinkedRelatedField(RelatedField):
self.lookup_url_kwarg = kwargs.pop('lookup_url_kwarg', self.lookup_field)
self.format = kwargs.pop('format', None)
- # We include these simply for dependancy injection in tests.
+ # We include these simply for dependency injection in tests.
# We can't add them as class attributes or they would expect an
- # implict `self` argument to be passed.
+ # implicit `self` argument to be passed.
self.reverse = reverse
self.resolve = resolve