mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-27 08:54:45 +00:00
Merge branch 'master' of github.com:webnotes/erpnext into production
This commit is contained in:
@@ -6,10 +6,10 @@
|
||||
"public/css/all-app.css": [
|
||||
"app/public/js/startup.css"
|
||||
],
|
||||
"public/js/all-web.js": [
|
||||
"public/js/all-web.min.js": [
|
||||
"app/public/js/website_utils.js"
|
||||
],
|
||||
"public/js/all-app.js": [
|
||||
"public/js/all-app.min.js": [
|
||||
"app/public/js/startup.js",
|
||||
"app/public/js/conf.js",
|
||||
"app/public/js/modules.js",
|
||||
|
||||
@@ -27,7 +27,6 @@ erpnext.modules = {
|
||||
'Setup': 'Setup',
|
||||
'Activity': 'activity',
|
||||
'To Do': 'todo',
|
||||
'Core': 'setup',
|
||||
'Calendar': 'calendar',
|
||||
'Messages': 'messages',
|
||||
'Knowledge Base': 'questions',
|
||||
|
||||
Reference in New Issue
Block a user