nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-09-14 01:20:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(merge): merge develop

Browse Source
This commit is contained in:
Rushabh Mehta
2020-12-08 16:23:09 +05:30
parent f4d645f87a 08d57e3530
commit fec8dba16c
306 changed files with 8707 additions and 2317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
erpnext/public/build.json
View File

@@ -40,7 +40,8 @@
"public/js/education/assessment_result_tool.html",
"public/js/hub/hub_factory.js",
"public/js/call_popup/call_popup.js",
"public/js/utils/dimension_tree_filter.js"
"public/js/utils/dimension_tree_filter.js",
"public/js/telephony.js"
],
"js/item-dashboard.min.js": [
"stock/dashboard/item_dashboard.html",