Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui

Browse Source

# Conflicts:
#	resources/views/partials/header.blade.php
#	routes/web.php

...

This commit is contained in:

edmondlang

2022-02-04 22:22:07 +08:00

parent 9cf30d559e

commit e3e4b490b0

126 changed files with 3295 additions and 563 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

resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue

+144 -37

File diff suppressed because one or more lines are too long