Merge branch 'hotfix'

hace 8 años · 60e04c82a9
--- a/frappe/init.py
+++ b/frappe/init.py
@@ -13,7 +13,7 @@ import os, sys, importlib, inspect, json
 from .exceptions import *
 from .utils.jinja import get_jenv, get_template, render_template

 __version__ = '8.0.48'
 __version__ = '8.0.49'
 __title__ = "Frappe Framework"

 local = Local()
--- a/frappe/translations/zh-cn.csv
+++ b/frappe/translations/zh-cn.csv