 edmondlang
|
0abf617a0d
|
Merge branch 'admin-settings-ui' of gitlab.com:CIEFWorldwideSdnBhd/shipping-portal into merge-dev-conflict
# Conflicts:
# app/Classes/Modules/Announcements/DataTransferObjects/AnnouncementObject.php
# app/Classes/Modules/Segments/ControllersLogic/CreateSegmentLogic.php
# app/Classes/Modules/Segments/ControllersLogic/DeleteSegmentLogic.php
# app/Classes/Modules/Segments/DataTransferObjects/SegmentObject.php
# app/Classes/Modules/Segments/Services/CreatesSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanCreateSegment.php
# app/Classes/Modules/Segments/Standards/Rules/CanDeleteSegment.php
# app/Classes/Modules/Segments/Standards/Validators/SegmentValidation.php
# app/Http/Controllers/Announcements/AssignAnnouncementToSegmentController.php
# app/Http/Controllers/Announcements/RemoveSegmentFromAnnouncementController.php
# app/Http/Controllers/Segments/DeleteSegmentController.php
# routes/announcement.php
# routes/segment.php
# routes/web.php
|
2022-02-12 20:16:33 +08:00 |
|
ahmedsophyudden