Commits · e2500b0526f19466f131c4141a82372f70fc3915 · Prasetya Saputra / clone_excelso

13 May, 2020 19 commits
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · e2500b05
  Afid authored May 13, 2020
```
# Conflicts:
#	App.js
```
  e2500b05
- pasang font · be7c32db
  Afid authored May 13, 2020
  
  be7c32db
- dw · cb8ad49b
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  cb8ad49b
- font · c4230eab
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  c4230eab
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 68aaf8d1
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  68aaf8d1
- bbb · f3d4bafb
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  f3d4bafb
- fix error · 7a30f19f
  Trisno authored May 13, 2020
  
  7a30f19f
- update · 923263e4
  Trisno authored May 13, 2020
  
  923263e4
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 3cfeaef7
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  3cfeaef7
- update fix error · c03e6b0e
  Trisno authored May 13, 2020
  
  c03e6b0e
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · b165c5d6
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  b165c5d6
- aa · 253af2af
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  253af2af
- update · c5f58433
  Trisno authored May 13, 2020
  
  c5f58433
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · c5ecd381
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  c5ecd381
- fix shopping cart · 6ffbb141
  Trisno authored May 13, 2020
  
  6ffbb141
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 689da5c8
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  689da5c8
- update · 0b39053f
  Trisno authored May 13, 2020
  
  0b39053f
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · da0eaad7
  Wahyu Adjie Prasetyo authored May 13, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  da0eaad7
- bbbb · 1c458e5e
  Wahyu Adjie Prasetyo authored May 13, 2020
  
  1c458e5e
12 May, 2020 21 commits
- update sampe order · d5d28a34
  Trisno authored May 12, 2020
  
  d5d28a34
- update order · 4aa4d938
  Trisno authored May 12, 2020
  
  4aa4d938
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 8b89561d
  Trisno authored May 12, 2020
  
  8b89561d
- update sampe order · 68fc5794
  Trisno authored May 12, 2020
  
  68fc5794
- add outlets pertama · f5b33cc3
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  f5b33cc3
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 07102d44
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  07102d44
- add reward/diskon · 3055a794
  Trisno authored May 12, 2020
  
  3055a794
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 6c13851b
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  6c13851b
- tambah touchableopacity di voucher shopping cart · 3601ac20
  Trisno authored May 12, 2020
  
  3601ac20
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · ffb55903
  Wahyu Adjie Prasetyo authored May 12, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  ffb55903
- sdsd · 5161e829
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  5161e829
- add reward di shopping cart · 37ecc649
  Trisno authored May 12, 2020
  
  37ecc649
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 16c8be4d
  Trisno authored May 12, 2020
  
  16c8be4d
- update reward list · e943baed
  Trisno authored May 12, 2020
  
  e943baed
- perubahan design 2 · 136a5c30
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  136a5c30
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · f2d56bfe
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  f2d56bfe
- perubahan design 1 · a74daa9e
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  a74daa9e
- update reward select dan reward list · 0f3a3559
  Trisno authored May 12, 2020
  
  0f3a3559
- add detail reward redux · f813a651
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  f813a651
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · c635aeab
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  c635aeab
- fungsi expired sudah jalan · 4e3edb32
  Wahyu Adjie Prasetyo authored May 12, 2020
  
  4e3edb32