resources · af4ce88a00c1901de9a980264f3c314246db3e3c · jhon / pa21617d4ti08

Merge branch 'master' of https://gitlab.del.ac.id/charles/pa21617d4ti08 · af4ce88a

authored 7 years ago

# 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
..
assets	Admin LTE First Push	8 years ago
lang/en	Admin LTE First Push	8 years ago
views	Merge branch 'master' of https://gitlab.del.ac.id/charles/pa21617d4ti08	7 years ago