mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-24 15:39:20 +00:00
Merge branch 'master' of github.com:webnotes/erpnext
Conflicts: patches/patch_list.py
This commit is contained in:
@@ -171,4 +171,5 @@ patch_list = [
|
||||
"execute:webnotes.conn.sql('update tabUserRole set parentfield=\"user_roles\" where parentfield=\"userroles\"')",
|
||||
"patches.february_2013.fix_outstanding",
|
||||
"patches.february_2013.p01_event",
|
||||
"execute:webnotes.delete_doc('Page', 'Calendar')"
|
||||
]
|
||||
Reference in New Issue
Block a user