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

Conflicts:
	index.html
This commit is contained in:
Anand Doshi
2011-11-15 15:24:11 +05:30
25 changed files with 372 additions and 252 deletions

View File

@@ -79,4 +79,4 @@ throw new SyntaxError('JSON.parse');};}}());wn.versions.check();wn.require("lib/
</div>
<script>wn.require('js/app.js');</script>
<div id="dialog_back"></div>
</body>
</body>