Merge branch 'develop'

This commit is contained in:
Anand Doshi 2016-03-10 15:51:35 +05:30
commit 73a0265e4f
4 changed files with 4 additions and 3 deletions

View File

@ -1,2 +1,2 @@
from __future__ import unicode_literals
__version__ = '6.25.3'
__version__ = '6.25.4'

View File

@ -7,7 +7,7 @@ app_publisher = "Frappe Technologies Pvt. Ltd."
app_description = """ERP made simple"""
app_icon = "icon-th"
app_color = "#e74c3c"
app_version = "6.25.3"
app_version = "6.25.4"
app_email = "info@erpnext.com"
app_license = "GNU General Public License (v3)"
source_link = "https://github.com/frappe/erpnext"

View File

@ -253,3 +253,4 @@ erpnext.patches.v6_23.update_stopped_status_to_closed
erpnext.patches.v6_24.repost_valuation_rate_for_serialized_items
erpnext.patches.v6_24.set_recurring_id
erpnext.patches.v6_20x.set_compact_print
execute:frappe.delete_doc_if_exists("Web Form", "contact") #2016-03-10

View File

@ -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(