Merge branch 'master' of github.com:webnotes/erpnext
Conflicts:
patches/patch.py
diff --git a/patches/patch.py b/patches/patch.py
index 7f023e2..3d5e308 100644
--- a/patches/patch.py
+++ b/patches/patch.py
@@ -1,7 +1,7 @@
# REMEMBER to update this
# ========================
-last_patch = 318
+last_patch = 319
#-------------------------------------------
@@ -1276,6 +1276,7 @@
elif patch_no == 317:
sql("update `tabPage` set name = 'profile-settings' where page_name = 'Profile Settings'")
elif patch_no == 318:
+ reload_doc('utilities', 'doctype', 'bulk_rename_tool')
+ elif patch_no == 319:
sql("delete from tabFeed where doc_name like 'New %'")
-