Merge branch 'develop' into validate_regional_germany

2020-10-06 16:53:52 +02:00
parent 81ad90c1d4 b16e447f86
commit 2acfc2a034
96 changed files with 101880 additions and 14656 deletions
--- a/erpnext/hooks.py
+++ b/erpnext/hooks.py
@@ -23,7 +23,6 @@ web_include_css = "assets/css/erpnext-web.css"
 doctype_js = {
 	"Communication": "public/js/communication.js",
 	"Event": "public/js/event.js",
-	"Website Theme": "public/js/website_theme.js",
 	"Newsletter": "public/js/newsletter.js"
 }