Merge branch 'develop' of github.com:webnotes/erpnext into hotfix

2014-01-17 10:31:43 +05:30 · 2014-01-17 10:31:43 +05:30 · 9a05aad8ea
commit 9a05aad8ea
parent f6b77479d7 3c279163fc
1 changed files with 2 additions and 2 deletions
--- a/config.json
+++ b/config.json
@ -1,6 +1,6 @@
 {
 "app_name": "ERPNext", 
- "app_version": "3.6.1", 
+ "app_version": "3.6.2", 
 "base_template": "app/portal/templates/base.html", 
 "modules": {
  "Accounts": {
@ -74,5 +74,5 @@
   "type": "module"
  }
 }, 
- "requires_framework_version": "==3.7.1"
+ "requires_framework_version": "==3.7.2"
 }