aboutsummaryrefslogtreecommitdiffstats
path: root/debug_toolbar/__init__.py
diff options
context:
space:
mode:
authorDavid Cramer2011-05-10 00:02:39 -0700
committerDavid Cramer2011-05-10 00:02:39 -0700
commit875a26213b9c623ddc90bfcf92f419ac8b45d007 (patch)
tree458cfcc32d2d31ea54a6538aaae0d8b0ff2b0af9 /debug_toolbar/__init__.py
parent3292aff531d4dee5cf30a003d5d2ee745f718f86 (diff)
parentbbf99c1639bfec6d2edc4473f8adb278970db7a5 (diff)
downloaddjango-debug-toolbar-875a26213b9c623ddc90bfcf92f419ac8b45d007.tar.bz2
Merge branch 'master' into andrepl-master
Conflicts: debug_toolbar/middleware.py
Diffstat (limited to 'debug_toolbar/__init__.py')
-rw-r--r--debug_toolbar/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/debug_toolbar/__init__.py b/debug_toolbar/__init__.py
index df5bb74..90f9e2f 100644
--- a/debug_toolbar/__init__.py
+++ b/debug_toolbar/__init__.py
@@ -1,2 +1,2 @@
-VERSION = (0, 8, 4)
+VERSION = (0, 8, 5)
__version__ = '.'.join(map(str, VERSION))