Merge branch 'master' into dev

Conflicts:
	erpnext/patches/patch_list.py
This commit is contained in:
Anand Doshi 2012-06-26 12:20:29 +05:30
commit 401f12418f

View File

@ -457,4 +457,9 @@ patch_list = [
'patch_file': 'delete_old_parent_entries',
'description': "delete entries of child table having parent like old_par%% or ''"
},
{
'patch_module': 'patches.april_2012',
'patch_file': 'delete_about_contact',
'description': "delete depracated doctypes of website module"
},
]