Merge develop into sla_fix

This commit is contained in:
Himanshu Warekar
2019-06-06 10:46:36 +05:30
176 changed files with 452121 additions and 444288 deletions

View File

@@ -14,8 +14,6 @@ source_link = "https://github.com/frappe/erpnext"
develop_version = '12.x.x-develop'
error_report_email = "support@erpnext.com"
app_include_js = "assets/js/erpnext.min.js"
app_include_css = "assets/css/erpnext.css"
web_include_js = "assets/js/erpnext-web.min.js"