Commits · 67d943bc3b52bc9a524cc0c6c1c27e4dc02b1821 · TimeOut / TimeOutAdmin

10 May, 2019 7 commits
- Merge branch 'master' into 'dev_production' · 67d943bc
  Tobin authored May 10, 2019
```
dc

See merge request !51
```
  67d943bc
- dc · 4a965bdf
  Tobin authored May 10, 2019
  
  4a965bdf
- Merge branch 'master' into 'dev_production' · 9e1db16b
  Tobin authored May 10, 2019
```
dc

See merge request !50
```
  9e1db16b
- dc · dc6102e0
  Tobin authored May 10, 2019
  
  dc6102e0
- Merge branch 'master' into 'dev_production' · 6b624687
  Tobin authored May 10, 2019
```
Master

See merge request !49
```
  6b624687
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · ff42dde9
  Jansa Jose authored May 10, 2019
  
  ff42dde9
- Language translation in mobile api · 5340f6ae
  Jansa Jose authored May 10, 2019
  
  5340f6ae
09 May, 2019 13 commits
- Merge branch 'master' into 'dev_production' · 0ce00f3a
  Tobin authored May 09, 2019
```
Master

See merge request !48
```
  0ce00f3a
- dc · 1ab93906
  Tobin authored May 09, 2019
  
  1ab93906
- filter api · 5461f4da
  Jansa Jose authored May 09, 2019
  
  5461f4da
- eveng tag · aa46e262
  Jansa Jose authored May 09, 2019
  
  aa46e262
- web api category image change · c04bc962
  Jansa Jose authored May 09, 2019
  
  c04bc962
- arabic translation · 25b97e4b
  Jansa Jose authored May 09, 2019
  
  25b97e4b
- web api changes · 24784ddf
  Jansa Jose authored May 09, 2019
  
  24784ddf
- Merge branch 'master' into 'dev_production' · f97dfc56
  Tobin authored May 09, 2019
```
Master

See merge request !47
```
  f97dfc56
- Merge branch 'jansa' of https://gitlab.techware.co.in/timeout/timeOut into tobin · dac51e58
  Tobin authored May 09, 2019
  
  dac51e58
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 189c0e8d
  Tobin authored May 09, 2019
  
  189c0e8d
- dc · ad0a97c3
  Tobin authored May 09, 2019
  
  ad0a97c3
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 64016f7a
  Jansa Jose authored May 09, 2019
  
  64016f7a
- category arabic icon · cf617154
  Jansa Jose authored May 09, 2019
  
  cf617154
08 May, 2019 12 commits
- Merge branch 'master' into 'dev_production' · 41cfd2cc
  Tobin authored May 08, 2019
```
Master

See merge request !46
```
  41cfd2cc
- Merge branch 'jansa' into 'master' · 465b7d9d
  Tobin authored May 08, 2019
```
Jansa

See merge request !45
```
  465b7d9d
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · ad03ecd3
  Jansa Jose authored May 08, 2019
  
  ad03ecd3
- booking and event api · a52f59bc
  Jansa Jose authored May 08, 2019
  
  a52f59bc
- Merge branch 'master' into 'dev_production' · 44a3a910
  Tobin authored May 08, 2019
```
Master

See merge request !44
```
  44a3a910
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 4f9a1319
  Tobin authored May 08, 2019
  
  4f9a1319
- dc · ea211a88
  Tobin authored May 08, 2019
  
  ea211a88
- Merge branch 'master' into 'dev_production' · 7d61b616
  Tobin authored May 08, 2019
```
Master

See merge request !43
```
  7d61b616
- Merge branch 'jansa' into 'master' · 5135c1d9
  Tobin authored May 08, 2019
```
Jansa

See merge request !42
```
  5135c1d9
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 9e81086b
  Jansa Jose authored May 08, 2019
  
  9e81086b
- status issues fixing · e7430cac
  Jansa Jose authored May 08, 2019
  
  e7430cac
- dc · 452a540d
  Tobin authored May 08, 2019
  
  452a540d
07 May, 2019 6 commits
- Merge branch 'master' into 'dev_production' · 782812dc
  Tobin authored May 07, 2019
```
Master

See merge request !41
```
  782812dc
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 4aaf92aa
  Tobin authored May 07, 2019
  
  4aaf92aa
- dc · 7f1256e9
  Tobin authored May 07, 2019
  
  7f1256e9
- Merge branch 'jansa' into 'master' · 00848737
  Tobin authored May 07, 2019
```
Jansa

See merge request !40
```
  00848737
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · fcf74925
  Jansa Jose authored May 07, 2019
```
# Conflicts:
#	application/models/Webservice_model.php
```
  fcf74925
- crone job · 142ad8d2
  Jansa Jose authored May 07, 2019
  
  142ad8d2
06 May, 2019 2 commits
- Merge branch 'master' into 'dev_production' · 805dde06
  Tobin authored May 06, 2019
```
dc

See merge request !39
```
  805dde06
- dc · cf4b3c77
  Tobin authored May 06, 2019
  
  cf4b3c77