Commits · ccda95a6f492895d4faf938f5d20bc14c4ac24ae · Tobin / dcarfixers_angular

23 May, 2019 6 commits
- Merge branch 'jensa' into 'master' · ccda95a6
  Tobin authored May 23, 2019
```
Jensa

See merge request !34
```
  ccda95a6
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · c0808a97
  Jansa Jose authored May 23, 2019
```
# Conflicts:
#	package-lock.json
```
  c0808a97
- Merge branch 'amal' into 'master' · 49be1901
  amal authored May 23, 2019
```
Amal

See merge request !31
```
  49be1901
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into amal · b750bba5
  amalk authored May 23, 2019
  
  b750bba5
- 23-05-2019|10:02 · 9cbda9df
  amalk authored May 23, 2019
  
  9cbda9df
- dc · 6ec41de7
  Jansa Jose authored May 23, 2019
  
  6ec41de7
02 May, 2019 2 commits
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · 18f01fce
  Jansa Jose authored May 02, 2019
  
  18f01fce
- tooltip · f6c2dc6f
  Jansa Jose authored May 02, 2019
  
  f6c2dc6f
30 Apr, 2019 8 commits
- Merge branch 'amal' into 'master' · 38b7634e
  amal authored Apr 30, 2019
```
Amal

See merge request !30
```
  38b7634e
- Merge branch 'master' into amal · 378c03c9
  amalk authored Apr 30, 2019
  
  378c03c9
- 30-04-2019|15:52 · f14e4817
  amalk authored Apr 30, 2019
  
  f14e4817
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · bbeba1d6
  Jansa Jose authored Apr 30, 2019
  
  bbeba1d6
- dc · 2371d2cc
  Jansa Jose authored Apr 30, 2019
  
  2371d2cc
- Merge branch 'amal' into 'master' · aa1a5bbb
  amal authored Apr 30, 2019
```
Amal

See merge request !29
```
  aa1a5bbb
- Merge branch 'master' into amal · 76bd408a
  amalk authored Apr 30, 2019
  
  76bd408a
- 30-04-2019|11:48 · 37a936a4
  amalk authored Apr 30, 2019
  
  37a936a4
26 Apr, 2019 5 commits
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · 0f22cbdf
  Jansa Jose authored Apr 26, 2019
```
# Conflicts:
#	src/styles.scss
```
  0f22cbdf
- dc · ff6a66f3
  Jansa Jose authored Apr 26, 2019
  
  ff6a66f3
- Merge branch 'amal' into 'master' · aa6e72b6
  amal authored Apr 26, 2019
```
Amal

See merge request !28
```
  aa6e72b6
- Merge branch 'master' into amal · 3d2305a9
  amalk authored Apr 26, 2019
  
  3d2305a9
- 26-04-2019|16:36 · f4d679bf
  amalk authored Apr 26, 2019
  
  f4d679bf
24 Apr, 2019 2 commits
- Merge branch 'amal' into 'master' · a79d93c2
  amal authored Apr 24, 2019
```
Amal 17:11|24-04-2019

See merge request !27
```
  a79d93c2
- Amal 17:11|24-04-2019 · 0a784fd7
  amalk authored Apr 24, 2019
  
  0a784fd7
11 Apr, 2019 6 commits
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · d3677ac3
  Jansa Jose authored Apr 11, 2019
```
# Conflicts:
#	src/styles.scss
```
  d3677ac3
- dc- appontment details and service history · 2448c5c8
  Jansa Jose authored Apr 11, 2019
  
  2448c5c8
- Merge branch 'jensa' into 'master' · b2e6ee2e
  Tobin authored Apr 11, 2019
```
Jensa

See merge request !26
```
  b2e6ee2e
- Merge branch 'amal' into 'master' · 81a483d0
  amal authored Apr 11, 2019
```
Amal

See merge request !25
```
  81a483d0
- Merge branch 'master' into amal · dadf805b
  amalk authored Apr 11, 2019
  
  dadf805b
- Amal 11-04-2019|10:22 · 19518a95
  amalk authored Apr 11, 2019
  
  19518a95
10 Apr, 2019 10 commits
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · fab431ee
  Jansa Jose authored Apr 10, 2019
  
  fab431ee
- Merge branch 'amal' into 'master' · 9c7cbc92
  amal authored Apr 10, 2019
```
Amal

See merge request !24
```
  9c7cbc92
- dc · b159b451
  Jansa Jose authored Apr 10, 2019
  
  b159b451
- Merge branch 'master' into amal · 292cef5b
  amalk authored Apr 10, 2019
  
  292cef5b
- Amal 10-04-2019|15:13 · 5c558346
  amalk authored Apr 10, 2019
  
  5c558346
- Merge branch 'master' of https://gitlab.techware.co.in/tobin/dcarfixers_angular into jensa · 375b7fe5
  Jansa Jose authored Apr 10, 2019
  
  375b7fe5
- dc · c891dd4d
  Jansa Jose authored Apr 10, 2019
  
  c891dd4d
- Merge branch 'amal' into 'master' · 6e443894
  amal authored Apr 10, 2019
```
Amal

See merge request !23
```
  6e443894
- Amal 10-04-2019|09:35 · 3cffa72f
  amalk authored Apr 10, 2019
  
  3cffa72f
- Amal 10-04-2019|09:31 · ff1803d6
  amalk authored Apr 10, 2019
  
  ff1803d6
09 Apr, 2019 1 commit
- Merge branch 'jensa' into 'master' · 2def1342
  Tobin authored Apr 09, 2019
```
dc

See merge request !22
```
  2def1342