mirror of
https://github.com/frappe/erpnext.git
synced 2026-03-18 17:55:40 +00:00
(cherry picked from commit 5911934dc7)
# Conflicts:
# erpnext/assets/doctype/asset_maintenance_log/asset_maintenance_log.json
# erpnext/patches.txt