Merge branch 'develop' of https://github.com/frappe/erpnext into lms-beta-v2

This commit is contained in:
scmmishra
2019-03-27 18:27:05 +05:30
345 changed files with 29781 additions and 11939 deletions

View File

@@ -11,7 +11,7 @@
"public/js/shopping_cart.js"
],
"css/erpnext-web.css": [
"public/less/website.less"
"public/scss/website.scss"
],
"js/marketplace.min.js": [
"public/js/hub/marketplace.js"