aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-06-27 13:00:05 +0100
committerTom Christie2013-06-27 13:00:05 +0100
commit7ba2f44a0f0e5ed7bac0fbdbb0112bbfe43f6d24 (patch)
tree1b178c1c3a2368a03563de510cf1eb6a84c4b1b9
parent124ae8c2c88d48b67fbaee77e337e8a6f37d1b70 (diff)
downloaddjango-rest-framework-7ba2f44a0f0e5ed7bac0fbdbb0112bbfe43f6d24.tar.bz2
Version 2.3.62.3.6
-rw-r--r--docs/topics/release-notes.md6
-rw-r--r--rest_framework/__init__.py2
2 files changed, 5 insertions, 3 deletions
diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md
index 4fecbf1f..d379ab74 100644
--- a/docs/topics/release-notes.md
+++ b/docs/topics/release-notes.md
@@ -40,13 +40,15 @@ You can determine your currently installed version using `pip freeze`:
## 2.3.x series
-### Master
+### 2.3.6
+
+**Date**: 27th June 2013
* Added `trailing_slash` option to routers.
* Include support for `HttpStreamingResponse`.
* Support wider range of default serializer validation when used with custom model fields.
* UTF-8 Support for browsable API descriptions.
-* OAuth2 provider usez timezone aware datetimes when supported.
+* OAuth2 provider uses timezone aware datetimes when supported.
* Bugfix: Return error correctly when OAuth non-existent consumer occurs.
* Bugfix: Allow `FileUploadParser` to correctly filename if provided as URL kwarg.
* Bugfix: Fix `ScopedRateThrottle`.
diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py
index 0a210186..776618ac 100644
--- a/rest_framework/__init__.py
+++ b/rest_framework/__init__.py
@@ -1,4 +1,4 @@
-__version__ = '2.3.5'
+__version__ = '2.3.6'
VERSION = __version__ # synonym