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

Conflicts:
	index.html
	versions-master.db
This commit is contained in:
Anand Doshi
2012-01-09 17:27:12 +05:30
5 changed files with 7 additions and 16 deletions

1
version.num Normal file
View File

@@ -0,0 +1 @@
11