Merge branch 'staging' into tag-cloud (292c8ea0) · Commits · Marc Tröll / frag.jetzt SWTP 2022 · GitLab

Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

frag.jetzt SWTP 2022
- Activity
- Members
- Labels
- Issues
  0
- Issue boards
- Milestones
- Wiki
- Environments
- Terraform modules
- Incidents

Snippets Groups Projects

This is an archived project. Repository and other project resources are read-only.

292c8ea0

Commit 292c8ea0 authored 3 years ago by

Ruben Bimberg

Downloads
- Plain Diff

Merge branch 'staging' into tag-cloud

# Conflicts:
#	src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts

parents 2f851253 bcf2a604

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/shared/_dialogs/cloud-configuration/cloud-configuration.component.scss 0 additions, 5 deletions

...gs/cloud-configuration/cloud-configuration.component.scss
src/app/components/shared/_dialogs/create-comment/create-comment.component.scss 2 additions, 2 deletions

...red/_dialogs/create-comment/create-comment.component.scss
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.html 1 addition, 0 deletions

.../shared/_dialogs/spacy-dialog/spacy-dialog.component.html
src/app/components/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts 17 additions, 5 deletions

...ts/shared/_dialogs/spacy-dialog/spacy-dialog.component.ts
src/app/components/shared/comment/comment.component.ts 21 additions, 5 deletions

src/app/components/shared/comment/comment.component.ts
src/app/components/shared/header/header.component.scss 11 additions, 1 deletion

src/app/components/shared/header/header.component.scss

with 52 additions and 18 deletions

0% or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment