Anand Doshi 1bba28a723 Merge branch 'shf_rename' ...

Conflicts:
	erpnext/patches/patch_list.py

2012-05-15 18:22:55 +05:30

..

accounts

Merge branch 'shf_rename'

2012-05-14 18:03:45 +05:30

buying

merge js/css

2012-05-14 15:03:17 +05:30

home

cleaned up imports, doc

2012-05-11 15:53:37 +05:30

hr

merge js/css

2012-05-14 15:03:17 +05:30

patches

Merge branch 'shf_rename'

2012-05-15 18:22:55 +05:30

production

cleaned up imports, doc

2012-05-11 15:53:37 +05:30

projects

cleaned up imports, doc

2012-05-11 15:53:37 +05:30

sandbox

rename dt first cut

2012-03-30 12:29:06 +05:30

selling

Merge branch 'shf_rename'

2012-05-15 18:22:55 +05:30

setup

fixes to website settings and linking import data in setup

2012-05-14 15:02:35 +05:30

startup

Merge branch 'shf_rename'

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

stock

Merge branch 'shf_rename'

2012-05-15 18:22:55 +05:30

support

Merge branch 'shf_rename'

2012-05-14 18:03:45 +05:30

utilities

cleaned up imports, doc

2012-05-11 15:53:37 +05:30

website

fixes to website settings and linking import data in setup

2012-05-14 15:02:35 +05:30

.no_timestamps

…