Merge branch 'master' of github.com:webnotes/erpnext

.gitignore

@@ -5,4 +5,5 @@ server_tools
 patch.log
 lib
 versions-local.db
+user_files
 *.sql*

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]={}}

version.num

@@ -1 +1 @@
-48
+49