Commits · 7d02478358ba175f8e03e89d2dad17c74d0eff1e · Juliper / pa2d4ti06

15 May, 2017 9 commits
- kedua · 7d024783
  Palti Sinaga authored May 15, 2017
  
  7d024783
- no message · ebeb7706
  Juliper authored May 15, 2017
  
  ebeb7706
- pembayaran has · 930c3f41
  Juliper authored May 15, 2017
  
  930c3f41
- no message · 3043f861
  Juliper authored May 15, 2017
  
  3043f861
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · 52d6b173
  Palti Sinaga authored May 15, 2017
```
# Conflicts:
#	resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php
```
  52d6b173
- push lagi · 802b242c
  Palti Sinaga authored May 15, 2017
  
  802b242c
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · 97bbeff7
  Juliper authored May 15, 2017
  
  97bbeff7
- pembayaran · 0d4ce676
  Juliper authored May 15, 2017
  
  0d4ce676
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · 7d621d2e
  Palti Sinaga authored May 15, 2017
  
  7d621d2e
14 May, 2017 5 commits
- transaction will done in time · ee014bec
  Juliper authored May 14, 2017
  
  ee014bec
- ntah apa · b580b3fd
  Palti Sinaga authored May 14, 2017
  
  b580b3fd
- reapir · fe9c68c1
  Juliper authored May 14, 2017
  
  fe9c68c1
- no message · 6e26785e
  Juliper authored May 14, 2017
  
  6e26785e
- no message · 9b958902
  Juliper authored May 14, 2017
  
  9b958902
13 May, 2017 17 commits
- repair homestay · 0cf7f211
  Palti Sinaga authored May 13, 2017
  
  0cf7f211
- homestay · ad280621
  Palti Sinaga authored May 13, 2017
  
  ad280621
- repair · d5e650f4
  Palti Sinaga authored May 13, 2017
  
  d5e650f4
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · d2fc0500
  Juliper authored May 13, 2017
  
  d2fc0500
- no message · 88596e7d
  Juliper authored May 13, 2017
  
  88596e7d
- a · 5e7ac728
  Palti Sinaga authored May 13, 2017
  
  5e7ac728
- list book op · 70875f94
  Juliper authored May 13, 2017
  
  70875f94
- script · 318ab22a
  Palti Sinaga authored May 13, 2017
```
div calender
```
  318ab22a
- apa <<<<<<HEAD? · 502e3d38
  Palti Sinaga authored May 13, 2017
  
  502e3d38
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · 1256fecf
  Palti Sinaga authored May 13, 2017
```
# Conflicts:
#	resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
```
  1256fecf
- new calendar · 6b537cf3
  Palti Sinaga authored May 13, 2017
  
  6b537cf3
- lagi dan algi · 1b1aa66e
  Juliper authored May 13, 2017
  
  1b1aa66e
- op · 1b52afe7
  Juliper authored May 13, 2017
  
  1b52afe7
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · 0f3eed02
  Palti Sinaga authored May 13, 2017
```
# Conflicts:
#	resources/views/vendor/adminlte/layouts/pages/Homestay.blade.php
#	resources/views/vendor/adminlte/layouts/partialweb/mainheader.blade.php
```
  0f3eed02
- profile · f55a15ef
  Palti Sinaga authored May 13, 2017
  
  f55a15ef
- again · 36fc9a90
  Juliper authored May 13, 2017
  
  36fc9a90
- all in has will complete · e0fae37f
  Juliper authored May 13, 2017
  
  e0fae37f
10 May, 2017 9 commits
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · f3f2287d
  Palti Sinaga authored May 10, 2017
  
  f3f2287d
- no message · 6d9bdef2
  Palti Sinaga authored May 10, 2017
  
  6d9bdef2
- profile completee · f3b1285e
  Juliper authored May 10, 2017
  
  f3b1285e
- x · 3e7254b7
  Palti Sinaga authored May 10, 2017
  
  3e7254b7
- tambah sweet popup · 42e20a5f
  Palti Sinaga authored May 10, 2017
  
  42e20a5f
- still in profile · 11593880
  Juliper authored May 10, 2017
  
  11593880
- Merge branch 'master' of https://gitlab.del.ac.id/juliper19/pa2d4ti06 · d7f65837
  Palti Sinaga authored May 10, 2017
  
  d7f65837
- abc · 0f9c5667
  Palti Sinaga authored May 10, 2017
  
  0f9c5667
- profile again · 692b7dd1
  Juliper authored May 10, 2017
  
  692b7dd1