| commit | 22c9497833f7721d131151826cb6e98ea6c07d48 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@erpnext.com> | Wed Jan 02 14:02:36 2013 +0530 |
| committer | Anand Doshi <anand@erpnext.com> | Wed Jan 02 14:02:36 2013 +0530 |
| tree | bf2e9dd33e54f8955460bf0a04a628ca18c1063a | |
| parent | 946442d7a5b0cfc7c5c5abbc6fdfc323f2f5193a [diff] [blame] | |
| parent | 3ee4f9a90e90889d1daa15c7a1097c1e54900db1 [diff] [blame] |
Merge branch 'edge' of github.com:webnotes/erpnext into edge Conflicts: patches/patch_list.py
diff --git a/patches/patch_list.py b/patches/patch_list.py index 94566d7..e620c9b 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py
@@ -578,4 +578,8 @@ 'patch_module': 'patches.january_2013', 'patch_file': 'deprecate_stock_search_criteria', }, + { + 'patch_module': 'patches.january_2013', + 'patch_file': 'remove_bad_permissions', + }, ] \ No newline at end of file