Anand Doshi 2513e50dc4 Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge ... Conflicts: erpnext/website/doctype/style_settings/style_settings.txt version.num		2012-03-27 19:37:10 +05:30
..
doctype	Merge branch 'handlerupdate' of github.com:webnotes/erpnext into shf_merge	2012-03-27 19:37:10 +05:30
page	Merge branch 'handlerupdate' into sync_handler_merge	2012-03-23 13:55:20 +05:30
__init__.py	added activity page	2012-02-29 15:11:06 +05:30
transaction_base.py	fax added in address display	2012-03-21 17:07:42 +05:30