Commits · f2f7b1e338cbc79983c2537b2f488d5924dcc6ae · TimeOut / TimeOutAdmin

12 Nov, 2019 7 commits
- Merge branch 'master' into 'dev_production' · f2f7b1e3
  Tobin authored Nov 12, 2019
```
Master

See merge request !197
```
  f2f7b1e3
- Merge branch 'dev_production' into 'master' · 81f2ba66
  Tobin authored Nov 12, 2019
```
# Conflicts:
#   application/config/database.php
```
  81f2ba66
- Merge branch 'jansa' into 'master' · fa656788
  Tobin authored Nov 12, 2019
```
Jansa

See merge request !196
```
  fa656788
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 4760d1b6
  Jansa Jose authored Nov 12, 2019
  
  4760d1b6
- dc · 07e38392
  Jansa Jose authored Nov 12, 2019
  
  07e38392
- dc · 8b6d20a1
  Jansa Jose authored Nov 12, 2019
  
  8b6d20a1
- organizer api changes · 309ad191
  Jansa Jose authored Nov 12, 2019
  
  309ad191
11 Nov, 2019 12 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 0869a7ed
  Tobin authored Nov 11, 2019
```
# Conflicts:
#	application/controllers/Webservice.php
#	application/models/Webservice_model.php
```
  0869a7ed
- dc · 48b12131
  Tobin authored Nov 11, 2019
  
  48b12131
- checker details · b92a545f
  Jansa Jose authored Nov 11, 2019
  
  b92a545f
- checker apis shifting · 12e7b90a
  Jansa Jose authored Nov 11, 2019
  
  12e7b90a
- Merge branch 'master' into 'dev_production' · c071d85e
  Tobin authored Nov 11, 2019
```
Master

See merge request !195
```
  c071d85e
- Merge branch 'jansa' into 'master' · c275c17a
  Tobin authored Nov 11, 2019
```
Jansa

See merge request !194
```
  c275c17a
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · b7ba5d94
  Jansa Jose authored Nov 11, 2019
  
  b7ba5d94
- country list · 7014330e
  Jansa Jose authored Nov 11, 2019
  
  7014330e
- Merge branch 'master' into 'dev_production' · 92cf38e5
  Tobin authored Nov 11, 2019
```
Master

See merge request !193
```
  92cf38e5
- Merge branch 'jansa' into 'master' · 8b4166a6
  Tobin authored Nov 11, 2019
```
Jansa

See merge request !192
```
  8b4166a6
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · a18c05b9
  Jansa Jose authored Nov 11, 2019
  
  a18c05b9
- get checkers list · 845bfe13
  Jansa Jose authored Nov 11, 2019
  
  845bfe13
08 Nov, 2019 17 commits
- Merge branch 'master' into 'dev_production' · c7b8f7f6
  Tobin authored Nov 08, 2019
```
Master

See merge request !191
```
  c7b8f7f6
- Merge branch 'jansa' into 'master' · b1f55d7f
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !190
```
  b1f55d7f
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1d8a8c7a
  Jansa Jose authored Nov 08, 2019
  
  1d8a8c7a
- booking details · 6e243f61
  Jansa Jose authored Nov 08, 2019
  
  6e243f61
- Merge branch 'master' into 'dev_production' · a151e22d
  Tobin authored Nov 08, 2019
```
Master

See merge request !189
```
  a151e22d
- Merge branch 'jansa' into 'master' · d14c33a3
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !188
```
  d14c33a3
- getEventDetails · 50d97223
  Jansa Jose authored Nov 08, 2019
  
  50d97223
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 45226fa0
  Jansa Jose authored Nov 08, 2019
  
  45226fa0
- qrcode · 0ce395a4
  Jansa Jose authored Nov 08, 2019
  
  0ce395a4
- Merge branch 'master' into 'dev_production' · a9b06884
  Tobin authored Nov 08, 2019
```
Master

See merge request !187
```
  a9b06884
- Merge branch 'jansa' into 'master' · 37d0f7a4
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !186
```
  37d0f7a4
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · f0b86ac4
  Jansa Jose authored Nov 08, 2019
  
  f0b86ac4
- json_decode changes · 683f22a5
  Jansa Jose authored Nov 08, 2019
  
  683f22a5
- Merge branch 'master' into 'dev_production' · ca4a98b7
  Tobin authored Nov 08, 2019
```
Master

See merge request !185
```
  ca4a98b7
- Merge branch 'jansa' into 'master' · 4242636a
  Tobin authored Nov 08, 2019
```
Jansa

See merge request !184
```
  4242636a
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 3828aee3
  Jansa Jose authored Nov 08, 2019
  
  3828aee3
- trawex and organizer api changes · d24d374b
  Jansa Jose authored Nov 08, 2019
  
  d24d374b
07 Nov, 2019 4 commits
- Merge branch 'master' into 'dev_production' · 46fabceb
  Tobin authored Nov 07, 2019
```
Master

See merge request !183
```
  46fabceb
- Merge branch 'jansa' into 'master' · 923e8a10
  Tobin authored Nov 07, 2019
```
Jansa

See merge request !182
```
  923e8a10
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 35507b83
  Jansa Jose authored Nov 07, 2019
  
  35507b83
- changes in trawex api · 3ad01cbd
  Jansa Jose authored Nov 07, 2019
  
  3ad01cbd