"src/git@git.thm.de:mtrl12/frag-jetzt-swtp-2022.git" did not exist on "41fc66a5bc3a19ee3a1259c43416854ee951caa9"
Merge branch 'staging' into tag-cloud
# Conflicts: # src/app/components/shared/header/header.component.html # src/assets/i18n/creator/de.json # src/assets/i18n/participant/de.json
Showing
- src/app/components/creator/room-creator-page/room-creator-page.component.html 1 addition, 1 deletion...reator/room-creator-page/room-creator-page.component.html
- src/app/components/moderator/room-moderator-page/room-moderator-page.component.html 1 addition, 1 deletion...or/room-moderator-page/room-moderator-page.component.html
- src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html 4 additions, 4 deletions...-administration/topic-cloud-administration.component.html
- src/app/components/shared/header/header.component.html 43 additions, 42 deletionssrc/app/components/shared/header/header.component.html
- src/app/components/shared/header/header.component.scss 3 additions, 3 deletionssrc/app/components/shared/header/header.component.scss
- src/app/components/shared/questionwall/question-wall/question-wall.component.scss 2 additions, 0 deletions...d/questionwall/question-wall/question-wall.component.scss
- src/app/components/shared/room-list/room-list.component.html 1 addition, 1 deletionsrc/app/components/shared/room-list/room-list.component.html
- src/assets/i18n/creator/de.json 84 additions, 82 deletionssrc/assets/i18n/creator/de.json
- src/assets/i18n/creator/en.json 2 additions, 2 deletionssrc/assets/i18n/creator/en.json
- src/assets/i18n/demo/demo-de.html 3 additions, 3 deletionssrc/assets/i18n/demo/demo-de.html
- src/assets/i18n/home/de.json 23 additions, 23 deletionssrc/assets/i18n/home/de.json
- src/assets/i18n/home/en.json 5 additions, 5 deletionssrc/assets/i18n/home/en.json
- src/assets/i18n/participant/de.json 62 additions, 61 deletionssrc/assets/i18n/participant/de.json
- src/assets/i18n/participant/en.json 2 additions, 1 deletionsrc/assets/i18n/participant/en.json
Please register or sign in to comment