• ari_darmawan's avatar
    Merge branch 'update-feature-v2' into development · 19a05923
    ari_darmawan authored
    # Conflicts:
    #	src/app/admin/admin-dashboard/admin-dashboard-report/admin-dashboard-report.component.html
    #	src/app/admin/admin-dashboard/admin-dashboard-report/admin-dashboard-report.component.ts
    #	src/assets/configAPI.json
    19a05923
Name
Last commit
Last update
..
admin-dashboard Loading commit data...
admin-livedashboard Loading commit data...
admin-macro Loading commit data...
admin-selectfiletemplate Loading commit data...
admin-ticket Loading commit data...
admin-ticket-onpic Loading commit data...
login-logs Loading commit data...
admin-routing.module.ts Loading commit data...
admin.module.ts Loading commit data...