Anand Doshi 4a3d3d75de Merge branch 'shf_rename' ...

Conflicts:
	erpnext/patches/patch_list.py

2012-05-14 12:53:29 +05:30

..

all-app.js

Merge branch 'shf_rename'

2012-05-14 12:53:29 +05:30

all-web.js

Merge branch 'shf_rename'

2012-05-14 12:53:29 +05:30

complete_setup.js

fix in issues arising due to wn.require

2012-05-10 14:19:11 +05:30

fields.js

Merge branch 'shf_rename'

2012-05-14 12:53:29 +05:30

kb_common.js

fix in issues arising due to wn.require

2012-05-10 14:19:11 +05:30

listing.js

…

print_query.js

…

product_category.js

fix in issues arising due to wn.require

2012-05-10 14:19:11 +05:30

report-legacy.js

…

wn-web.js

Merge branch 'shf_rename'

2012-05-14 12:53:29 +05:30