# Conflicts:
#   src/app/components/shared/comment/comment.component.scss

User statistics

See merge request arsnova/frag.jetzt!678

Merge branch '686-place-a-counter-at-the-user-number-icon-to-show-the-number-of-questions-of-this-user' into 'staging'

Resolve "Place a counter at the user number icon to show the number of questions of this user"

Closes #686

See merge request arsnova/frag.jetzt!674

Revert "Merge branch..."

See merge request arsnova/frag.jetzt!677

This reverts merge request !671

Merge branch 'staging' into 686-place-a-counter-at-the-user-number-icon-to-show-the-number-of-questions-of-this-user

Revert "Merge branch..."

See merge request arsnova/frag.jetzt!675

This reverts merge request !673

Merge branch '685-reassigned-the-rights-on-the-room-page-and-not-on-the-moderation-page' into 'staging'

fix room-page

Closes #685

See merge request arsnova/frag.jetzt!673

Resolve "Suppress the user number and keyword string to gain space"

Closes #684

See merge request arsnova/frag.jetzt!672

Merge branch '682-unify-options-menu-for-room-creator-page-room-moderator-page-and-room-participant-page' into 'staging'

unify room-pages

Closes #682

See merge request arsnova/frag.jetzt!671

Merge branch '681-add-the-possibility-to-add-the-name-of-the-questioner-to-a-comment' into 'staging'

Resolve "Add the possibility to add the name of the questioner to a comment"

Closes #666, #673, and #681

See merge request arsnova/frag.jetzt!669

Staging

See merge request arsnova/frag.jetzt!670

Resolve "Refactor - Create composable components"

Closes #667

See merge request arsnova/frag.jetzt!651

# Conflicts:
#   src/app/components/creator/room-creator-page/room-creator-page.component.ts

Merge branch '676-room-appears-twice-in-the-room-list-and-the-creator-role-seems-revoked' into 'staging'

Resolve "Room appears twice in the room list and the CREATOR role seems revoked"

Closes #675 and #676

See merge request arsnova/frag.jetzt!667

Merge branch 'staging' into 676-room-appears-twice-in-the-room-list-and-the-creator-role-seems-revoked

missing i18n

See merge request arsnova/frag.jetzt!668

Staging

See merge request arsnova/frag.jetzt!666