Anand Doshi 87a2c5cc69 Merge branch 'master' of github.com:webnotes/erpnext into shf_rename ... Conflicts: erpnext/accounts/doctype/c_form/c_form.txt erpnext/patches/patch_list.py erpnext/setup/doctype/permission_control/permission_control.py		2012-04-09 12:14:53 +05:30
..
april_2012	c-form reload pach	2012-04-06 17:49:25 +05:30
before_jan_2012	rerun of rename_dt	2012-04-02 19:12:29 +05:30
jan_mar_2012	fix in rename dt patch	2012-04-09 12:02:15 +05:30
mar_2012	Merge branch 'master' of github.com:webnotes/erpnext into shf_rename	2012-04-09 12:14:53 +05:30
__init__.py	first cut for lazy loading framework	2011-09-05 18:43:09 +05:30
patch_list.py	Merge branch 'master' of github.com:webnotes/erpnext into shf_rename	2012-04-09 12:14:53 +05:30