• 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
..
app Loading commit data...
assets Loading commit data...
environments Loading commit data...
shared/serviceproxy Loading commit data...
browserslist Loading commit data...
favicon.ico Loading commit data...
index.html Loading commit data...
karma.conf.js Loading commit data...
main.ts Loading commit data...
polyfills.ts Loading commit data...
proxy.conf.json Loading commit data...
styles.css Loading commit data...
test.ts Loading commit data...
tsconfig.app.json Loading commit data...
tsconfig.spec.json Loading commit data...
tslint.json Loading commit data...