aboutsummaryrefslogtreecommitdiffstats
path: root/docs/tutorial/5-relationships-and-hyperlinked-apis.md
diff options
context:
space:
mode:
authorMichael Elovskikh2013-01-28 16:26:16 +0600
committerMichael Elovskikh2013-01-28 16:26:16 +0600
commit499d6424aee5b71b8e6b2500bf14fa85321bfc26 (patch)
tree34f575fb078377208ded5251aea050668355d82a /docs/tutorial/5-relationships-and-hyperlinked-apis.md
parent180c94dc44a9cc5b882364a58b0b12a8ab430c22 (diff)
parent3bcd38b7d0ddaa2c051ad230cb0d749f9737fd82 (diff)
downloaddjango-rest-framework-499d6424aee5b71b8e6b2500bf14fa85321bfc26.tar.bz2
Merge branch 'upstream_master' into docs_patch_method
Conflicts: docs/api-guide/authentication.md
Diffstat (limited to 'docs/tutorial/5-relationships-and-hyperlinked-apis.md')
-rw-r--r--docs/tutorial/5-relationships-and-hyperlinked-apis.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/tutorial/5-relationships-and-hyperlinked-apis.md b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
index 27898f7b..de856611 100644
--- a/docs/tutorial/5-relationships-and-hyperlinked-apis.md
+++ b/docs/tutorial/5-relationships-and-hyperlinked-apis.md
@@ -165,7 +165,7 @@ We've reached the end of our tutorial. If you want to get more involved in the
* Contribute on [GitHub][github] by reviewing and submitting issues, and making pull requests.
* Join the [REST framework discussion group][group], and help build the community.
-* [Follow the author on Twitter][twitter] and say hi.
+* Follow [the author][twitter] on Twitter and say hi.
**Now go build awesome things.**