Mohd Arief 534ad41fd3 fix conflict

2018-06-27 17:25:11 +08:00

..

components

fix conflict

2018-06-27 17:25:11 +08:00

lang

integrated frontend

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

layouts

integrated frontend

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

middleware

solved merge conflict

2018-06-26 10:40:35 +08:00

pages

fix merge conflict

2018-06-27 16:54:40 +08:00

plugins

complete the admin setting navbar

2018-06-25 16:57:18 +08:00

router

update route for admin top nav content

2018-06-27 16:33:41 +08:00

store

added admin status to booking table

2018-06-22 12:31:51 +08:00

app.js

booking page done except upload

2018-06-08 11:55:39 +08:00