1. 31 May, 2017 2 commits
    • Fix Product · a987de7d
      jhon authored
    • Merge branch 'master' of https://gitlab.del.ac.id/charles/pa21617d4ti08 · af4ce88a
      jhon 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
  2. 23 May, 2017 4 commits
  3. 22 May, 2017 1 commit
  4. 21 May, 2017 1 commit
  5. 17 May, 2017 2 commits
  6. 15 May, 2017 1 commit
  7. 14 May, 2017 3 commits
  8. 12 May, 2017 3 commits
  9. 08 May, 2017 5 commits
  10. 03 May, 2017 2 commits
  11. 26 Apr, 2017 1 commit