Merge branch 'develop'

This commit is contained in:
Pratik Vyas 2013-12-30 19:34:38 +05:30
commit a0a43ca4e4

View File

@ -1,6 +1,6 @@
{ {
"app_name": "ERPNext", "app_name": "ERPNext",
"app_version": "3.4.1", "app_version": "3.4.2",
"base_template": "app/portal/templates/base.html", "base_template": "app/portal/templates/base.html",
"modules": { "modules": {
"Accounts": { "Accounts": {
@ -74,5 +74,5 @@
"type": "module" "type": "module"
} }
}, },
"requires_framework_version": "==3.4.1" "requires_framework_version": "==3.4.2"
} }