From 79aea2f0d082f17e7bb75cc32bd71b5f04836d43 Mon Sep 17 00:00:00 2001 From: Tom Christie Date: Fri, 21 Dec 2012 09:18:35 +0000 Subject: [PATCH] Version 2.1.12 --- README.md | 8 ++++++++ docs/topics/release-notes.md | 4 +++- rest_framework/__init__.py | 2 +- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b4078b15c..13a78724f 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,14 @@ To run the tests. # Changelog +### 2.1.12 + +**Date**: 21st Dec 2012 + +* Bugfix: Fix bug that could occur using ChoiceField. +* Bugfix: Fix exception in browseable API on DELETE. +* Bugfix: Fix issue where pk was was being set to a string if set by URL kwarg. + ## 2.1.11 **Date**: 17th Dec 2012 diff --git a/docs/topics/release-notes.md b/docs/topics/release-notes.md index 741d908cf..6dedc3d22 100644 --- a/docs/topics/release-notes.md +++ b/docs/topics/release-notes.md @@ -6,7 +6,9 @@ ## 2.1.x series -### Master +### 2.1.12 + +**Date**: 21st Dec 2012 * Bugfix: Fix bug that could occur using ChoiceField. * Bugfix: Fix exception in browseable API on DELETE. diff --git a/rest_framework/__init__.py b/rest_framework/__init__.py index d5cac5c6d..02bc6fc1d 100644 --- a/rest_framework/__init__.py +++ b/rest_framework/__init__.py @@ -1,3 +1,3 @@ -__version__ = '2.1.11' +__version__ = '2.1.12' VERSION = __version__ # synonym