Merge branch 'develop'

frappe · Mar 3, 2016 · 82d9b4f · 82d9b4f
2 parents a48c626 + e3a4dac
commit 82d9b4f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/frappe/__version__.py b/frappe/__version__.py
@@ -1,2 +1,2 @@
 from __future__ import unicode_literals
-__version__ = "6.25.3"
+__version__ = "6.25.4"
diff --git a/frappe/hooks.py b/frappe/hooks.py
@@ -5,7 +5,7 @@
 app_description = "Full stack web framework with Python, Javascript, MariaDB, Redis, Node"
 
 app_icon = "octicon octicon-circuit-board"
-app_version = "6.25.3"
+app_version = "6.25.4"
 app_color = "orange"
 source_link = "https://github.com/frappe/frappe"
 app_license = "MIT"

diff --git a/setup.py b/setup.py
@@ -1,7 +1,7 @@
 from setuptools import setup, find_packages
 from pip.req import parse_requirements
 
-version = "6.25.3"
+version = "6.25.4"
 requirements = parse_requirements("requirements.txt", session="")
 
 setup(