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

Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-03-01 14:54:01 +05:30
4 changed files with 15 additions and 11 deletions

View File

@@ -1 +1 @@
787
787