Merge branch 'master' of github.com:webnotes/erpnext
Conflicts: patches/patch.py
This commit is contained in:
commit
52b1d5aac8
@ -1,7 +1,7 @@
|
||||
# REMEMBER to update this
|
||||
# ========================
|
||||
|
||||
last_patch = 318
|
||||
last_patch = 319
|
||||
|
||||
#-------------------------------------------
|
||||
|
||||
@ -1276,6 +1276,7 @@ def execute(patch_no):
|
||||
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 %'")
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user