Commits · 286b4480ec4ce8f1f530bbe9ac2d94e064b7005c · TimeOut / TimeOutAdmin

18 Oct, 2019 6 commits
- Merge branch 'jansa' into 'master' · 286b4480
  Tobin authored Oct 18, 2019
```
Jansa

See merge request !116
```
  286b4480
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1974180b
  Jansa Jose authored Oct 18, 2019
  
  1974180b
- session change · c9f46eff
  Jansa Jose authored Oct 18, 2019
  
  c9f46eff
- Merge branch 'jansa' into 'master' · 961917cf
  Tobin authored Oct 18, 2019
```
Jansa

See merge request !114
```
  961917cf
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 210ea914
  Jansa Jose authored Oct 18, 2019
  
  210ea914
- changes in oraganizer model · 4c86ee17
  Jansa Jose authored Oct 18, 2019
  
  4c86ee17
17 Oct, 2019 6 commits
- Merge branch 'jansa' into 'master' · 075df7e5
  Tobin authored Oct 17, 2019
```
Jansa

See merge request !112
```
  075df7e5
- changes · 9424e792
  Jansa Jose authored Oct 17, 2019
  
  9424e792
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 3d029ae4
  Jansa Jose authored Oct 17, 2019
  
  3d029ae4
- create new file validation organizer model · 5a1160d0
  Jansa Jose authored Oct 17, 2019
  
  5a1160d0
- Merge branch 'jansa' into 'master' · a6f32e8e
  Tobin authored Oct 17, 2019
```
dc

See merge request !110
```
  a6f32e8e
- dc · 1bbb1d7c
  Jansa Jose authored Oct 17, 2019
  
  1bbb1d7c
15 Oct, 2019 1 commit
- dc · f00c9ece
  Tobin authored Oct 15, 2019
  
  f00c9ece
10 Oct, 2019 1 commit
- dc · 9752e130
  Tobin authored Oct 10, 2019
  
  9752e130
09 Oct, 2019 5 commits
- dc · 7b08f979
  Tobin authored Oct 09, 2019
  
  7b08f979
- dc · a8847f39
  Tobin authored Oct 09, 2019
  
  a8847f39
- dc · 9bc3bfd7
  Tobin authored Oct 09, 2019
  
  9bc3bfd7
- dc · cc6250fa
  Tobin authored Oct 09, 2019
  
  cc6250fa
- dc · 444e9510
  Tobin authored Oct 09, 2019
  
  444e9510
08 Oct, 2019 2 commits
- dc · 2f39e1d8
  Tobin authored Oct 08, 2019
  
  2f39e1d8
- dc · 7faace52
  Tobin authored Oct 08, 2019
  
  7faace52
07 Oct, 2019 1 commit
- dc · 4b364cd8
  Tobin authored Oct 07, 2019
  
  4b364cd8
04 Oct, 2019 2 commits
- dc · ef439d5b
  Tobin authored Oct 04, 2019
  
  ef439d5b
- dc · e680e527
  Tobin authored Oct 04, 2019
  
  e680e527
03 Oct, 2019 2 commits
- dc · 3b036b3c
  Tobin authored Oct 03, 2019
  
  3b036b3c
- dc · 3280636f
  Tobin authored Oct 03, 2019
  
  3280636f
30 Sep, 2019 1 commit
- dc · b2eeb1bb
  Tobin authored Sep 30, 2019
  
  b2eeb1bb
26 Sep, 2019 7 commits
- Merge branch 'jansa' of https://gitlab.techware.co.in/timeout/timeOut into tobin · 2503af97
  Tobin authored Sep 26, 2019
  
  2503af97
- dc · 2982e2cf
  Tobin authored Sep 26, 2019
  
  2982e2cf
- language changes in api · 962cfbc7
  Jansa Jose authored Sep 26, 2019
  
  962cfbc7
- Merge branch 'jansa' of https://gitlab.techware.co.in/timeout/timeOut into tobin · c11da653
  Tobin authored Sep 26, 2019
```
# Conflicts:
#	application/models/Webservice_model.php
```
  c11da653
- dc · f805fac4
  Tobin authored Sep 26, 2019
  
  f805fac4
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 35ba3213
  Jansa Jose authored Sep 26, 2019
  
  35ba3213
- language changes · 27ee566d
  Jansa Jose authored Sep 26, 2019
  
  27ee566d
24 Sep, 2019 4 commits
- Merge branch 'jansa' into 'master' · 10a8a4bd
  Tobin authored Sep 24, 2019
```
Jansa

See merge request !96
```
  10a8a4bd
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · be763f0b
  Jansa Jose authored Sep 24, 2019
```
# Conflicts:
#	application/controllers/Webservice.php
#	application/models/Webservice_model.php
```
  be763f0b
- dc · 4dbcccdc
  Jansa Jose authored Sep 24, 2019
  
  4dbcccdc
- dc · c5265aab
  Tobin authored Sep 24, 2019
  
  c5265aab
18 Sep, 2019 2 commits
- Merge branch 'master' of https://gitlab.techware.co.in/timeout/timeOut into jansa · 1eef46a0
  Jansa Jose authored Sep 18, 2019
  
  1eef46a0
- change in promocode api · 5d893d68
  Jansa Jose authored Sep 18, 2019
  
  5d893d68