Merge branch 'develop'

pdvyas · pdvyas · commit add031d21610 · 2014-05-21T16:33:25.000+05:30
diff --git a/config.json b/config.json
@@ -1,6 +1,6 @@
 {
  "app_name": "ERPNext", 
- "app_version": "3.14.2", 
+ "app_version": "3.14.3", 
  "base_template": "app/portal/templates/base.html", 
  "modules": {
   "Accounts": {
@@ -74,5 +74,5 @@
    "type": "module"
   }
  }, 
- "requires_framework_version": "==3.13.6"
+ "requires_framework_version": "==3.13.7"
 }

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"app_name": "ERPNext",`
`3`		`- "app_version": "3.14.2",`
	`3`	`+ "app_version": "3.14.3",`
`4`	`4`	`"base_template": "app/portal/templates/base.html",`
`5`	`5`	`"modules": {`
`6`	`6`	`"Accounts": {`
`@@ -74,5 +74,5 @@`
`74`	`74`	`"type": "module"`
`75`	`75`	`}`
`76`	`76`	`},`
`77`		`- "requires_framework_version": "==3.13.6"`
	`77`	`+ "requires_framework_version": "==3.13.7"`
`78`	`78`	`}`