nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-19 04:59:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fix] merge conflict

Browse Source
This commit is contained in:
Akhilesh Darjee
2013-09-05 13:18:22 +05:30
parent 38e8f989fa ea55734df5
commit a7b7d2559e
173 changed files with 1635 additions and 514 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
patches/patch_list.py
View File

@@ -262,4 +262,5 @@ patch_list = [
"patches.september_2013.p01_fix_buying_amount_gl_entries",
"patches.september_2013.p01_update_communication",
"patches.september_2013.p02_make_pos_view_checked_in_features_setup",
"patches.september_2013.p02_fix_serial_no_status",
]