Merge branch 'release/0.7.0' into develop

klen · Sep 25, 2014 · 861805f · 861805f
2 parents 03e2726 + 741e465
commit 861805f
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Changelog b/Changelog
@@ -2,6 +2,7 @@
 
 	* Remove python2.6, Django 1.4 support
 	* Add Django 1.7 support
+	* Version 0.7.0
 
 2014-06-04  horneds
 

diff --git a/django_markdown/__init__.py b/django_markdown/__init__.py
@@ -1,6 +1,6 @@
 """ Django-Markdown supports markdown in Django. """
 
-__version__ = "0.6.1"
+__version__ = "0.7.0"
 __project__ = "django-markdown"
 __author__ = "Kirill Klenov <horneds@gmail.com>"
 __license__ = "GNU LGPL"