Merge branch 'staging' into 'master'
Staging See merge request arsnova/frag.jetzt!775
Showing
- projects/ars/src/lib/components/style/menu/material-btn/material-btn.component.scss 36 additions, 36 deletions...nents/style/menu/material-btn/material-btn.component.scss
- src/app/components/home/home-page/home-page.component.html 0 additions, 1 deletionsrc/app/components/home/home-page/home-page.component.html
- src/app/components/shared/header/header.component.html 4 additions, 4 deletionssrc/app/components/shared/header/header.component.html
- src/app/components/shared/questionwall/question-wall/question-wall.component.html 7 additions, 3 deletions...d/questionwall/question-wall/question-wall.component.html
- src/app/components/shared/questionwall/question-wall/question-wall.component.ts 6 additions, 1 deletion...red/questionwall/question-wall/question-wall.component.ts
- src/app/components/shared/room-join/room-join.component.html 1 addition, 1 deletionsrc/app/components/shared/room-join/room-join.component.html
- src/app/components/shared/room-page/room-page.component.ts 1 addition, 1 deletionsrc/app/components/shared/room-page/room-page.component.ts
- src/assets/i18n/demo/demo-de.html 15 additions, 5 deletionssrc/assets/i18n/demo/demo-de.html
- src/assets/i18n/demo/demo-en.html 15 additions, 4 deletionssrc/assets/i18n/demo/demo-en.html
- src/assets/i18n/participant/de.json 2 additions, 0 deletionssrc/assets/i18n/participant/de.json
- src/assets/i18n/participant/en.json 2 additions, 0 deletionssrc/assets/i18n/participant/en.json
Please register or sign in to comment