Mouhamed Lamine fb102df36c Fixed Merge Conflicts

2018-07-16 19:32:56 +08:00

..

AdminProgressTrack.vue

add new branch for booking flow for x2_chequeand x2_ba

2018-07-14 17:31:21 +08:00

App.vue

integrated frontend

2018-05-07 15:26:23 +08:00

Button.vue

integrated frontend

2018-05-07 15:26:23 +08:00

Card.vue

integrated frontend

2018-05-07 15:26:23 +08:00

Checkbox.vue

integrated frontend

2018-05-07 15:26:23 +08:00

Child.vue

integrated frontend

2018-05-07 15:26:23 +08:00

index.js

integrated frontend

2018-05-07 15:26:23 +08:00

Loading.vue

integrated frontend

2018-05-07 15:26:23 +08:00

LocaleDropdown.vue

Adding Completed Orders Link on Admin Nav Bar

2018-07-16 19:15:01 +08:00

LoginWithGithub.vue

integrated frontend

2018-05-07 15:26:23 +08:00

Navbar.vue

Adding Completed Orders Link on Admin Nav Bar

2018-07-16 19:15:01 +08:00

ProgressTrack.vue

added waiting invoice and po frontend

2018-06-28 10:33:00 +08:00