Commits · d012497664e05c88f390e9a90c526730bf09e2d4 · TimeOut / TimeOutAdmin

18 Dec, 2019 13 commits
- Merge branch 'master' into 'dev_production' · d0124976
  Tobin authored Dec 18, 2019
```
dc

See merge request !242
```
  d0124976
- dc · 7f9983be
  Tobin authored Dec 18, 2019
  
  7f9983be
- Merge branch 'master' into 'dev_production' · 4264c59e
  Tobin authored Dec 18, 2019
```
dc

See merge request !241
```
  4264c59e
- dc · fd2b5237
  Tobin authored Dec 18, 2019
  
  fd2b5237
- Merge branch 'master' into 'dev_production' · 82bc98d7
  Tobin authored Dec 18, 2019
```
dc

See merge request !240
```
  82bc98d7
- dc · a8b81b1e
  Tobin authored Dec 18, 2019
  
  a8b81b1e
- Merge branch 'master' into 'dev_production' · f4d51eb4
  Jansa Jose authored Dec 18, 2019
```
Master

See merge request !239
```
  f4d51eb4
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 8a8f2333
  Tobin authored Dec 18, 2019
  
  8a8f2333
- dc · 256bcd4f
  Tobin authored Dec 18, 2019
  
  256bcd4f
- J : organizer and hotel sevice model api · 9a9c5e1a
  Jansa Jose authored Dec 18, 2019
  
  9a9c5e1a
- Merge branch 'master' into 'dev_production' · b4521e0f
  Jansa Jose authored Dec 18, 2019
```
Master

See merge request !238
```
  b4521e0f
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 7358c548
  Jansa Jose authored Dec 18, 2019
  
  7358c548
- J : change in edit organization details in organizer webservice · fef9cfb6
  Jansa Jose authored Dec 18, 2019
  
  fef9cfb6
17 Dec, 2019 2 commits
- Merge branch 'master' into 'dev_production' · 9c93f95f
  Tobin authored Dec 17, 2019
```
dc

See merge request !237
```
  9c93f95f
- dc · 2bb57c97
  Tobin authored Dec 17, 2019
  
  2bb57c97
16 Dec, 2019 2 commits
- Merge branch 'master' into 'dev_production' · 8bd8986e
  Tobin authored Dec 16, 2019
```
Master

See merge request !236
```
  8bd8986e
- dc · d303d162
  Tobin authored Dec 16, 2019
  
  d303d162
13 Dec, 2019 3 commits
- J : webservice model event details change · 4c07c0a3
  Jansa Jose authored Dec 13, 2019
  
  4c07c0a3
- J : update wallet balance functionality in booking function · 5fbbba8f
  Jansa Jose authored Dec 13, 2019
  
  5fbbba8f
- J : wallet balance in event function in webservice · a330b1d6
  Jansa Jose authored Dec 13, 2019
  
  a330b1d6
12 Dec, 2019 4 commits
- Merge branch 'master' into 'dev_production' · 30cf8613
  Jansa Jose authored Dec 12, 2019
```
dc

See merge request !234
```
  30cf8613
- dc · e815c659
  Tobin authored Dec 12, 2019
  
  e815c659
- Merge branch 'master' into 'dev_production' · 267de95e
  Jansa Jose authored Dec 12, 2019
```
J : change in event function in api

See merge request !233
```
  267de95e
- J : change in event function in api · 3eeb8c06
  Jansa Jose authored Dec 12, 2019
  
  3eeb8c06
11 Dec, 2019 4 commits
- Merge branch 'master' into 'dev_production' · c263d9b0
  Jansa Jose authored Dec 11, 2019
```
Master

See merge request !232
```
  c263d9b0
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 242870c3
  Jansa Jose authored Dec 11, 2019
  
  242870c3
- j: space · 8757fda6
  Jansa Jose authored Dec 11, 2019
  
  8757fda6
- dc · 734de007
  Tobin authored Dec 11, 2019
  
  734de007
09 Dec, 2019 3 commits
- Merge branch 'master' into 'dev_production' · f4723d25
  Tobin authored Dec 09, 2019
```
Master

See merge request !231
```
  f4723d25
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · c609a986
  Tobin authored Dec 09, 2019
  
  c609a986
- dc · ce4bb13f
  Tobin authored Dec 09, 2019
  
  ce4bb13f
06 Dec, 2019 4 commits
- Merge branch 'master' into 'dev_production' · 34b3bea0
  Jansa Jose authored Dec 06, 2019
```
J : hotelsearch country data change

See merge request !230
```
  34b3bea0
- J : hotelsearch country data change · b286762f
  Jansa Jose authored Dec 06, 2019
  
  b286762f
- Merge branch 'master' into 'dev_production' · f036584c
  Jansa Jose authored Dec 06, 2019
```
Master

See merge request !229
```
  f036584c
- J : hotel search country data · c0dcff69
  Jansa Jose authored Dec 06, 2019
  
  c0dcff69
05 Dec, 2019 5 commits
- J : change booking sms text · c3178a8f
  Jansa Jose authored Dec 05, 2019
  
  c3178a8f
- Merge branch 'master' into 'dev_production' · 114dbe15
  Jansa Jose authored Dec 05, 2019
```
J : flight details api

See merge request !228
```
  114dbe15
- J : flight details api · 60d292a8
  Jansa Jose authored Dec 05, 2019
  
  60d292a8
- t : sync contact changes · 079a4f62
  Tobin authored Dec 05, 2019
  
  079a4f62
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into tobin · c8f820d4
  Tobin authored Dec 05, 2019
```
# Conflicts:
#	application/models/Webservice_model.php
```
  c8f820d4