| commit | c551964d5d2f3ce1976803407bea6c9a6e59b1b3 | [log] [tgz] |
|---|---|---|
| author | Anand Doshi <anand@iwebnotes.com> | Tue Dec 11 14:59:19 2012 +0530 |
| committer | Anand Doshi <anand@iwebnotes.com> | Tue Dec 11 14:59:19 2012 +0530 |
| tree | 6db565edf6d5a46af412c2072eae2ea12988f68a | |
| parent | 3519d7de018720c7be7f678d1d2748e3c52495d1 [diff] [blame] | |
| parent | 69b3730a18959208a50b6847f18de76ba831585f [diff] [blame] |
Merge branch 'master' into production Conflicts: patches/patch_list.py production/doctype/bom_explosion_item/bom_explosion_item.txt
diff --git a/patches/patch_list.py b/patches/patch_list.py index 5bb58b4..e985fa7 100644 --- a/patches/patch_list.py +++ b/patches/patch_list.py
@@ -525,5 +525,8 @@ { 'patch_module': 'patches.december_2012', 'patch_file': 'production_cleanup', + { + 'patch_module': 'patches.december_2012', + 'patch_file': 'fix_default_print_format', }, ] \ No newline at end of file