server/src/server.ts · f7b067a11be032f4edf76c7009e33385b55bd155 · SWP WS21_22 - Fahrtenbuch / Team Einhorn / fahrtenbuch · GitLab

Jan 27, 2022
f7b067a1
Merge branch 'main' into '29-add-missing-attributes-to-database' · f7b067a1
leandet98 authored Jan 27, 2022
```
# Conflicts:
#   server/src/server.ts
```
f7b067a1
Merge branch 'main' into '29-add-missing-attributes-to-database'
leandet98 authored Jan 27, 2022
```
# Conflicts:
#   server/src/server.ts
```