Merge branch 'staging' into develop

This commit is contained in:
Frappe Bot
2019-01-23 08:19:00 +00:00
35 changed files with 570 additions and 117 deletions

View File

@@ -19,7 +19,6 @@
# default settings that can be made for a user.
from __future__ import unicode_literals
import frappe
product_name = "ERPNext"
user_defaults = {