aboutsummaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorSébastien Piquemal2012-02-02 08:39:15 +0200
committerSébastien Piquemal2012-02-02 08:39:15 +0200
commit5f59d90645dfddc293bbbbc4ca9b4c3f3125b590 (patch)
treeaa3d091a1f61f5717f7f1a9e96334308bb13c7d9 /docs
parent152c385f4de37558fe4e522abad5b97f0cf7ddce (diff)
parent894f63259880252ed5317ce485eb13c4429b65c1 (diff)
downloaddjango-rest-framework-5f59d90645dfddc293bbbbc4ca9b4c3f3125b590.tar.bz2
merged with trunk's master
Diffstat (limited to 'docs')
-rw-r--r--docs/index.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/docs/index.rst b/docs/index.rst
index 0221ea05..ecc1f118 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -105,6 +105,8 @@ The following example exposes your `MyModel` model through an api. It will provi
contents
+.. include:: ../CHANGELOG.rst
+
Indices and tables
------------------