Merge remote-tracking branch 'origin/develop'

Browse Source

# Conflicts:
#	src/component/BreadcumbComponent.js
#	src/component/ProductComponent.js
#	src/config/app.js
#	src/index.css
#	src/pages/App/App.js
#	src/pages/App/DesktopLayout.js
#	src/pages/App/MenuList.js
#	src/pages/Home/Home.js
#	src/pages/Login/Login.js
#	src/pages/Membership/Membership.js
#	src/pages/Membership/MembershipModal.js
#	src/pages/Product/Product.js
#	src/pages/Transaction/Pulsa.js
#	src/pages/Transaction/Transaction.js
#	src/store/authentication.js
#	src/store/index.js
#	src/store/membership.js
#	src/store/product.js
#	src/store/role.js
#	src/store/ui.js
#	src/store/user.js
#	src/utils/http.js

...

This commit is contained in:

ilham

2022-01-28 15:58:48 +07:00

parent c1f8a79ad7 f638ca70f7

commit a4160ae2bd

76 changed files with 14076 additions and 5390 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

7671

yarn.lock

File diff suppressed because it is too large Load Diff