Commits · 25e5c6d7573f014bf9e1984f0359277c25a18408 · Indra Raja / queue

23 Oct, 2020 14 commits
- Cobaba · 25e5c6d7
  Azy Mushofy Anwary authored Oct 23, 2020
  
  25e5c6d7
- Merge branch 'v1.2' of http://git.khansia.co.id/indra/queue into v1.2 · 700de14c
  Azy Mushofy Anwary authored Oct 23, 2020
  
  700de14c
- Dashboard · 28be56dc
  Azy Mushofy Anwary authored Oct 23, 2020
  
  28be56dc
- Merge branch 'v1.3' into 'v1.2' · ef145a43
  Indra Raja authored Oct 23, 2020
```
commit

See merge request !3
```
  ef145a43
- Dashboard · 1c83ab30
  Azy Mushofy Anwary authored Oct 23, 2020
  
  1c83ab30
- commit · e6be4480
  Indra Raja authored Oct 23, 2020
  
  e6be4480
- Merge branch 'v1.3' into 'v1.2' · 09298ed9
  Indra Raja authored Oct 23, 2020
```
# Conflicts:
#   public/action-js/antrian-js/action-kelolapoli.js
```
  09298ed9
- Perubahan · 0d0c8e8f
  Azy Mushofy Anwary authored Oct 23, 2020
  
  0d0c8e8f
- initial commit · 6722ab76
  Indra Raja authored Oct 23, 2020
  
  6722ab76
- Merge branch 'master' of http://git.khansia.co.id/indra/queue into master · 7aaba2fb
  Azy Mushofy Anwary authored Oct 23, 2020
```
# Conflicts:
#	public/action-js/antrian-js/action-kelolapoli.js
```
  7aaba2fb
- as · 9eeba5fd
  Azy Mushofy Anwary authored Oct 23, 2020
  
  9eeba5fd
- commit · 344ac3d3
  Indra Raja authored Oct 23, 2020
  
  344ac3d3
- pERUBAHAN · 5d91bfce
  Azy Mushofy Anwary authored Oct 23, 2020
  
  5d91bfce
- initial commit · 0e982994
  Indra Raja authored Oct 23, 2020
  
  0e982994