Merge branch 'latest' of github.com:webnotes/erpnext into latest

Conflicts:
	index.html
	version.num
This commit is contained in:
Anand Doshi
2012-01-18 12:33:16 +05:30
8 changed files with 48 additions and 132 deletions

View File

@@ -1 +1 @@
49
49