commit c095cfa2249d06e1f9c87c2e28d5aa2060584ce6
author Nabin Hait <nabinhait@gmail.com> Fri Feb 07 11:49:45 2014 +0530
committer Nabin Hait <nabinhait@gmail.com> Fri Feb 07 11:49:45 2014 +0530
tree 1b3aab94e45cdf24e9f2e5e3bb6ca801dc66e020
parent fbb10d37d3e9436c619ce776e6257d30ccf7ae0b
parent 9294fc8e7e0cf83a89bde437b4208f493c862b1c

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

.travis.yml

diff --git a/.travis.yml b/.travis.yml
index c6402fe..41ba344 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-anguage: python
+language: python
 
 python:
   - "2.7"

config.json

diff --git a/config.json b/config.json
index 149f7a9..dba2e81 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,6 @@
 {
  "app_name": "ERPNext", 
- "app_version": "3.8.2", 
+ "app_version": "3.8.3", 
  "base_template": "app/portal/templates/base.html", 
  "modules": {
   "Accounts": {
@@ -74,5 +74,5 @@
    "type": "module"
   }
  }, 
- "requires_framework_version": "==3.9.1"
+ "requires_framework_version": "==3.9.2"
 }
\ No newline at end of file