There was an error fetching the commit references. Please try again later.
Merge branch 'staging' into tag-cloud
# Conflicts: # src/app/components/shared/_dialogs/create-comment/create-comment.component.ts
Showing
- src/app/components/creator/_dialogs/room-edit/room-edit.component.ts 2 additions, 1 deletion...ponents/creator/_dialogs/room-edit/room-edit.component.ts
- src/app/components/shared/_dialogs/create-comment/create-comment.component.html 1 addition, 1 deletion...red/_dialogs/create-comment/create-comment.component.html
- src/app/components/shared/_dialogs/create-comment/create-comment.component.scss 11 additions, 0 deletions...red/_dialogs/create-comment/create-comment.component.scss
- src/app/components/shared/_dialogs/create-comment/create-comment.component.ts 20 additions, 16 deletions...hared/_dialogs/create-comment/create-comment.component.ts
- src/app/components/shared/_dialogs/room-create/room-create.component.ts 1 addition, 0 deletions...ents/shared/_dialogs/room-create/room-create.component.ts
- src/app/components/shared/_dialogs/topic-cloud-administration/topic-cloud-administration.component.html 1 addition, 1 deletion...-administration/topic-cloud-administration.component.html
- src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.scss 1 addition, 1 deletion...logs/topic-cloud-filter/topic-cloud-filter.component.scss
- src/app/components/shared/_dialogs/topic-cloud-filter/topic-cloud-filter.component.ts 2 additions, 2 deletions...ialogs/topic-cloud-filter/topic-cloud-filter.component.ts
- src/app/components/shared/comment-list/comment-list.component.ts 1 addition, 1 deletion.../components/shared/comment-list/comment-list.component.ts
- src/app/components/shared/comment/comment.component.html 2 additions, 2 deletionssrc/app/components/shared/comment/comment.component.html
- src/app/components/shared/header/header.component.html 3 additions, 3 deletionssrc/app/components/shared/header/header.component.html
- src/app/components/shared/header/header.component.ts 1 addition, 1 deletionsrc/app/components/shared/header/header.component.ts
- src/app/components/shared/questionwall/question-wall/question-wall.component.html 1 addition, 1 deletion...d/questionwall/question-wall/question-wall.component.html
- src/app/components/shared/room-list/room-list.component.html 1 addition, 1 deletionsrc/app/components/shared/room-list/room-list.component.html
- src/app/models/room.ts 3 additions, 0 deletionssrc/app/models/room.ts
- src/assets/icons/hashtag.svg 1 addition, 8 deletionssrc/assets/icons/hashtag.svg
Please register or sign in to comment