nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-22 06:29:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'edge' of github.com:webnotes/erpnext into edge

Browse Source 
Conflicts:
	patches/patch_list.py
This commit is contained in:
Anand Doshi
2013-01-02 14:02:36 +05:30
parent 946442d7a5 3ee4f9a90e
commit 22c9497833
12 changed files with 45 additions and 955 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
patches/patch_list.py
View File

@@ -578,4 +578,8 @@ patch_list = [
'patch_module': 'patches.january_2013',
'patch_file': 'deprecate_stock_search_criteria',
},
{
'patch_module': 'patches.january_2013',
'patch_file': 'remove_bad_permissions',
},
]