Mouhamed Lamine a3aa98884d Merge conflicts fixed

2018-07-27 16:15:03 +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

Merge conflicts fixed

2018-07-27 16:15:03 +08:00

LoginWithGithub.vue

integrated frontend

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

Navbar.vue

Merge conflicts fixed

2018-07-27 16:15:03 +08:00

ProgressTrack.vue

Halfway through the task

2018-07-17 16:41:09 +08:00