mirror of
https://github.com/frappe/erpnext.git
synced 2026-04-13 11:55:11 +00:00
(cherry picked from commit ce2b9e0f1a)
# Conflicts:
# erpnext/setup/doctype/company/company.json
# erpnext/setup/doctype/company/company.py