Merge branch 'develop'

This commit is contained in:
Pratik Vyas 2014-02-10 20:57:25 +05:30
commit 89a3ee7f57

View File

@ -1,6 +1,6 @@
{ {
"app_name": "ERPNext", "app_name": "ERPNext",
"app_version": "3.8.4", "app_version": "3.8.5",
"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.9.3" "requires_framework_version": "==3.9.4"
} }