# Conflicts:
#	src/app/app.module.ts
#	src/app/components/shared/shared.module.ts
#	src/app/components/shared/tag-cloud/tag-cloud.component.html
#	src/app/components/shared/tag-cloud/tag-cloud.component.ts

Merge 'tag-cloud' into staging

Closes #222, #221, #220, and #219

See merge request arsnova/topic-cloud!127

[Ticket: #222]

Merge branch '202-link-the-settings-menu-options-on-the-room-page-to-the-corresponding-dialogues' into 'staging'

add room page settings to header

Closes #202

See merge request arsnova/topic-cloud!126

[Ticket: #219]

[Ticket: #220]

[Ticket: #220]

[Ticket: #221]

Merge 'tag-cloud' into staging

See merge request arsnova/topic-cloud!123

Ruben Bimberg authored 3 years ago and Klaus-Dieter Quibeldey-Cirkel committed 3 years ago

[Ticket: #186]

[Ticket: #186]

Merge 'tag-cloud' into staging

Closes #212

See merge request arsnova/topic-cloud!122

[Merge Request: !121][Ticket: #212]

Merge 'tag-cloud' into staging

Closes #213 and #212

See merge request arsnova/topic-cloud!121