Merge branch 'stable' into latest

2012-01-17 14:50:08 +05:30 · 2012-01-17 14:50:08 +05:30 · 2e7273118f
commit 2e7273118f
parent 16c4e72199 1019eff2af
2 changed files with 2 additions and 2 deletions
--- 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="34"
+	<script type="text/javascript">window._version_number="48"

 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]={}}
--- a/version.num
+++ b/version.num
@ -1 +1 @@
-34
+48