Master (!38) · Merge requests · m4lab_tv1 / User Account

An error occurred while fetching the assigned milestone of the selected merge_request.

Merged Rosanny Sihombing requested to merge master into devel 4 years ago

18 May, 2020 8 commits
- Merge branch 'prepare_production' into 'master' · 4c993c49
  Wolfgang Knopki authored 4 years ago
```
Prepare production

See merge request !33
```
  4c993c49
- Merge branch 'master' into 'prepare_production' · edc8354b
  Wolfgang Knopki authored 4 years ago
```
# Conflicts:
#   config/config.js
```
  edc8354b
- Update config.js, adapted paths · 6da9a2ad
  Wolfgang Knopki authored 4 years ago
  
  6da9a2ad
- Merge branch 'MLAB-224' into 'testing' · ece9da9c
  Wolfgang Knopki authored 4 years ago
```
changed image of projecttraeger in M4_Lab dependent sidebar

See merge request !32
```
  ece9da9c
- changed image of projecttraeger in M4_Lab dependent sidebar · c76b2c97
  Wolfgang Knopki authored 4 years ago
  
  c76b2c97
- Merge branch 'prepare_prdoucton' into 'master' · e0199f9d
  Wolfgang Knopki authored 4 years ago
```
Prepare prdoucton

See merge request !31
```
  e0199f9d
- Update config.js, db links und idp links updated · fc41f1cd
  Wolfgang Knopki authored 4 years ago
  
  fc41f1cd
- Update .gitlab-ci.yml, added section for master · df55a9cc
  Wolfgang Knopki authored 4 years ago
  
  df55a9cc
15 May, 2020 2 commits
- Merge branch 'MLAB-221' into 'testing' · e5a8e657
  Varun Srivastava authored 4 years ago
```
corrected typo error

See merge request !30
```
  e5a8e657
- corrected typo error · 38af91cf
  Varun Srivastava authored 4 years ago
  
  38af91cf
06 Apr, 2020 1 commit
- Merge branch 'MLAB-56' into 'master' · 62880f10
  Wolfgang Knopki authored 4 years ago
```
Mlab 56

See merge request !2
```
  62880f10