-
Merge branch 'master' of https://gitlab.del.ac.id/charles/pa21617d4ti08 · af4ce88ajhon authored# Conflicts: # app/Http/Controllers/CustomerController.php # app/Http/Controllers/InventoriController.php # app/Http/Controllers/KasirController.php # app/Pembelian.php # resources/views/vendor/adminlte/customer/BeliBarang/createPembelian.blade.php # resources/views/vendor/adminlte/customer/BeliBarang/index.blade.php # resources/views/vendor/adminlte/customer/HistoryPembelian/index.blade.php # resources/views/vendor/adminlte/inventori/ListBarang/create.blade.php # resources/views/vendor/adminlte/inventori/ListBarang/edit.blade.php # resources/views/vendor/adminlte/layouts/partials/sidebar.blade.php # routes/web.php
af4ce88a
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| index.blade.php | Loading commit data... |