Merge pull request #185 from ababic/release-prep/2.5

Update from 2.5rc1 to 2.5.0 (final)
jazzband · Oct 14, 2017 · 34167cd · 34167cd
2 parents 1f5f1c1 + 3161675
commit 34167cd
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 Changelog
 =========
 
-2.5.0a (XX.XX.XXXX) IN DEVELOPMENT
----------------------------------- 
+2.X.X (XX.XX.XXXX) IN DEVELOPMENT
+--------------------------------- 
+
+
+2.5.0 (14.10.2017)
+------------------ 
 
 * Added rendering logic to Menu classes and refactored all existing template
   tags to make use of it (massively reducing code duplication in menu_tags.py).

diff --git a/docs/source/releases/2.5rc1.rst → docs/source/releases/2.5.0.rst b/docs/source/releases/2.5rc1.rst → docs/source/releases/2.5.0.rst
@@ -1,10 +1,7 @@
 =================================
-Wagtailmenus 2.5rc1 release notes
+Wagtailmenus 2.5.0 release notes
 =================================
 
-.. NOTE::
-    This is a release candidate version. Please report any bugs or issues to the tracker at https://github.com/rkhleics/wagtailmenus/issues
-
 .. contents::
     :local:
     :depth: 1

diff --git a/docs/source/releases/index.rst b/docs/source/releases/index.rst
@@ -5,7 +5,7 @@ Release notes
 .. toctree::
     :maxdepth: 1
 
-    2.5rc1
+    2.5.0
     2.4.0
     2.3.2
     2.3.1

diff --git a/wagtailmenus/__init__.py b/wagtailmenus/__init__.py
@@ -3,7 +3,7 @@
 
 # major.minor.patch.release.number
 # release must be one of alpha, beta, rc, or final
-VERSION = (2, 5, 0, 'rc', 1)
+VERSION = (2, 5, 0, 'final', 0)
 __version__ = get_version(VERSION)
 stable_branch_name = get_stable_branch_name(VERSION)