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

Conflicts:
	version.num
This commit is contained in:
Anand Doshi
2012-02-24 19:28:09 +05:30
2 changed files with 2 additions and 2 deletions

View File

@@ -1 +1 @@
698
698