nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-23 15:09:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into latest

Browse Source 
Conflicts:
	index.html
	version.num
This commit is contained in:
Anand Doshi
2012-01-23 18:37:09 +05:30
parent cfdd827a84 706baf77ae
commit 590be7e643
12 changed files with 335 additions and 549 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
index.html
View File

@@ -3,6 +3,7 @@
<meta charset="utf-8">
<title>ERPNext</title>
<meta name="author" content="">
<<<<<<< HEAD
<script type="text/javascript">window._version_number="102";
/*
@@ -89,6 +90,9 @@ To subclass, use:
/*
* lib/js/wn/provide.js
*/
=======
<script type="text/javascript">window._version_number="51"
>>>>>>> master
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]={}}