Skip to content

Conversation

@t3chguy
Copy link
Member

@t3chguy t3chguy commented Nov 17, 2025

Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
…o t3chguy/PSB-968

Signed-off-by: Michael Telatynski <[email protected]>

# Conflicts:
#	res/css/views/rooms/_EmojiButton.pcss
#	res/css/views/rooms/_MessageComposer.pcss
#	res/img/element-icons/room/composer/attach.svg
#	res/img/element-icons/room/composer/emoji.svg
#	src/components/views/rooms/VoiceRecordComposerTile.tsx
Signed-off-by: Michael Telatynski <[email protected]>
Signed-off-by: Michael Telatynski <[email protected]>
…o t3chguy/PSB-968

Signed-off-by: Michael Telatynski <[email protected]>

# Conflicts:
#	playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-bubble-layout-linux.png
#	playwright/snapshots/polls/polls.spec.ts/ThreadView-with-a-poll-on-group-layout-linux.png
Signed-off-by: Michael Telatynski <[email protected]>
…o t3chguy/PSB-968

Signed-off-by: Michael Telatynski <[email protected]>

# Conflicts:
#	playwright/snapshots/crypto/history-sharing.spec.ts/shared-history-invite-accepted-linux.png
#	playwright/snapshots/invite/invite-dialog.spec.ts/send-your-first-message-view-linux.png
Signed-off-by: Michael Telatynski <[email protected]>
@t3chguy t3chguy added this pull request to the merge queue Dec 9, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to a conflict with the base branch Dec 9, 2025
…o t3chguy/PSB-968

# Conflicts:
#	res/css/views/rooms/_MessageComposer.pcss
@t3chguy t3chguy added this pull request to the merge queue Dec 9, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 9, 2025
@t3chguy t3chguy added this pull request to the merge queue Dec 9, 2025
@github-merge-queue github-merge-queue bot removed this pull request from the merge queue due to failed status checks Dec 9, 2025
@t3chguy t3chguy added this pull request to the merge queue Dec 9, 2025
Merged via the queue into develop with commit 4fda167 Dec 9, 2025
36 checks passed
@t3chguy t3chguy deleted the t3chguy/PSB-968 branch December 9, 2025 14:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants