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

Conflicts:
	erpnext/website/doctype/style_settings/style_settings.txt
	version.num
This commit is contained in:
Anand Doshi
2012-03-27 19:37:10 +05:30
17 changed files with 283 additions and 63 deletions

View File

@@ -1 +1 @@
1401
1460