mirror of
https://github.com/frappe/erpnext.git
synced 2026-05-12 17:51:20 +00:00
Merge branch 'stable' of github.com:webnotes/erpnext into stable
Conflicts: index.html versions-master.db
This commit is contained in:
Conflicts: index.html versions-master.db