commit 5c29eb08c471547720db2d2f7a35afb0b20f6d6e
author Mangesh-Khairnar <mkhairnar10@gmail.com> Mon Oct 19 18:29:46 2020 +0530
committer Mangesh-Khairnar <mkhairnar10@gmail.com> Mon Oct 19 18:29:46 2020 +0530
tree ed9d6972698247faa20f13cd363cc435993c06c1
parent ebb8ee3dc6a6c623e82659f76f6dac4d4200321e
parent 8115be58a3e4b0a4aaf2d3b1c7f617b3d6a4af7c

Merge branch 'develop' of https://github.com/frappe/erpnext into mpesa-integration

erpnext/patches.txt

diff --git a/erpnext/patches.txt b/erpnext/patches.txt
index 43564d8..5b45c22 100644
--- a/erpnext/patches.txt
+++ b/erpnext/patches.txt
@@ -729,4 +729,5 @@
 erpnext.patches.v13_0.rename_issue_doctype_fields
 erpnext.patches.v13_0.change_default_pos_print_format
 erpnext.patches.v13_0.set_youtube_video_id
-erpnext.patches.v13_0.set_payment_channel_in_payment_gateway_account
\ No newline at end of file
+erpnext.patches.v13_0.print_uom_after_quantity_patch
+erpnext.patches.v13_0.set_payment_channel_in_payment_gateway_account