Merge branch 'staging' into tag-cloud (06b6ea87) · 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.

06b6ea87

Commit 06b6ea87 authored 3 years ago by

Ruben Bimberg

Downloads
- Plain Diff

Merge branch 'staging' into tag-cloud

parents 8a7c9628 9a508ec1

No related merge requests found

Changes 11

Hide whitespace changes

Inline Side-by-side

Showing

src/app/components/creator/room-creator-page/room-creator-page.component.html 0 additions, 1 deletion

...reator/room-creator-page/room-creator-page.component.html
src/app/components/creator/room-creator-page/room-creator-page.component.scss 0 additions, 4 deletions

...reator/room-creator-page/room-creator-page.component.scss
src/app/components/moderator/room-moderator-page/room-moderator-page.component.scss 0 additions, 4 deletions

...or/room-moderator-page/room-moderator-page.component.scss
src/app/components/shared/overlay/active-user/active-user.component.html 9 additions, 10 deletions

...nts/shared/overlay/active-user/active-user.component.html
src/app/components/shared/overlay/active-user/active-user.component.ts 2 additions, 0 deletions

...nents/shared/overlay/active-user/active-user.component.ts
src/app/components/shared/tag-cloud/tag-cloud.component.html 1 addition, 1 deletion

src/app/components/shared/tag-cloud/tag-cloud.component.html
src/app/utils/cloud-parameters.ts 3 additions, 3 deletions

src/app/utils/cloud-parameters.ts
src/assets/i18n/creator/de.json 5 additions, 5 deletions

src/assets/i18n/creator/de.json
src/assets/i18n/creator/en.json 4 additions, 4 deletions

src/assets/i18n/creator/en.json
src/assets/i18n/home/de.json 5 additions, 5 deletions

src/assets/i18n/home/de.json
src/assets/i18n/home/en.json 5 additions, 5 deletions

src/assets/i18n/home/en.json

with 34 additions and 42 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