Merge branch 'master' of github.com:webnotes/erpnext into production

This commit is contained in:
Anand Doshi
2012-12-20 12:42:53 +05:30
7 changed files with 13 additions and 8 deletions

View File

@@ -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",

View File

@@ -27,7 +27,6 @@ erpnext.modules = {
'Setup': 'Setup',
'Activity': 'activity',
'To Do': 'todo',
'Core': 'setup',
'Calendar': 'calendar',
'Messages': 'messages',
'Knowledge Base': 'questions',