Commits · b5e5ea248ed85468f5b5a22dbb1b7b948451b03c · Prasetya Saputra / new_excelso

24 Apr, 2020 10 commits
- change · b5e5ea24
  Wahyu Adjie Prasetyo authored Apr 24, 2020
  
  b5e5ea24
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · ddc5c424
  Trisno authored Apr 24, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  ddc5c424
- update shopping cart · 2c35da1c
  Trisno authored Apr 24, 2020
  
  2c35da1c
- menu selection · b9eba13b
  Wahyu Adjie Prasetyo authored Apr 24, 2020
  
  b9eba13b
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 3b481e0a
  Trisno authored Apr 24, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  3b481e0a
- update · 987b2cca
  Trisno authored Apr 24, 2020
  
  987b2cca
- change address redux · 03e4a898
  Wahyu Adjie Prasetyo authored Apr 24, 2020
  
  03e4a898
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · 560b2871
  Wahyu Adjie Prasetyo authored Apr 24, 2020
```
# Conflicts:
#	view/ShoppingCart.js
```
  560b2871
- change · c54fc936
  Wahyu Adjie Prasetyo authored Apr 24, 2020
  
  c54fc936
- update shopping cart · 3d11b3d8
  Trisno authored Apr 24, 2020
  
  3d11b3d8
23 Apr, 2020 1 commit
- update · 32384956
  Trisno authored Apr 23, 2020
  
  32384956
22 Apr, 2020 7 commits
- coba yu · e309e7c4
  Afid authored Apr 22, 2020
  
  e309e7c4
- update baeu · ce1583f3
  Wahyu Adjie Prasetyo authored Apr 22, 2020
  
  ce1583f3
- Merge branch 'master' of ssh://repo.cs.co.id:2222/wahyu/bahanoprek · bb2a774a
  Wahyu Adjie Prasetyo authored Apr 22, 2020
```
# Conflicts:
#	redux/globalActionType.js
#	redux/globalReducer.js
#	view/MenuSelection.js
```
  bb2a774a
- ini · aa56680d
  Wahyu Adjie Prasetyo authored Apr 22, 2020
  
  aa56680d
- aaaaaaa · 1f2878b3
  Afid authored Apr 22, 2020
  
  1f2878b3
- baru tambah · 882f594f
  Afid authored Apr 22, 2020
  
  882f594f
- awal · 0881d4c0
  Wahyu Adjie Prasetyo authored Apr 22, 2020
  
  0881d4c0