Merge pull request #345 from divio/feature/release-1.2.1

prepare for the release 1.2.1
django-cms · May 25, 2016 · 595b43d · 595b43d
2 parents 3af8768 + 5f25188
commit 595b43d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -1,7 +1,7 @@
 CHANGELOG
 =========
 
-1.2.1 (Unreleased)
+1.2.1 (2016-05-25)
 ------------------
 
 * Fixed drag'n'drop on sortedm2m on touch devices

diff --git a/djangocms_admin_style/__init__.py b/djangocms_admin_style/__init__.py
@@ -1 +1 @@
-__version__ = '1.2.0'
+__version__ = '1.2.1'