Merge branch 'master' of github.com:webnotes/erpnext
diff --git a/.gitignore b/.gitignore
index 0818a02..e9e476b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
patch.log
lib
versions-local.db
+user_files
*.sql*
diff --git a/index.html b/index.html
index 159b2e2..bc3673c 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
- <script type="text/javascript">window._version_number="48"
+ <script type="text/javascript">window._version_number="49"
wn={}
wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
diff --git a/version.num b/version.num
index 31ff414..2e66562 100644
--- a/version.num
+++ b/version.num
@@ -1 +1 @@
-48
\ No newline at end of file
+49
\ No newline at end of file