Merge branch 'master' into dev
Conflicts:
erpnext/patches/patch_list.py
diff --git a/erpnext/patches/patch_list.py b/erpnext/patches/patch_list.py
index 5e5f4c9..7232d40 100644
--- a/erpnext/patches/patch_list.py
+++ b/erpnext/patches/patch_list.py
@@ -457,4 +457,9 @@
'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"
+ },
]
\ No newline at end of file