Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Use body field as media caption #1731

Merged
merged 4 commits into from
Feb 26, 2024
Merged

Use body field as media caption #1731

merged 4 commits into from
Feb 26, 2024
+140 −8

Conversation

zecakeh
Copy link
Contributor

@zecakeh zecakeh commented Feb 25, 2024 •
edited by github-actions bot
Loading

@zecakeh
Use body field as media caption
4b6e1ab 
As per MSC2530.

Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh zecakeh requested a review from a team as a code owner February 25, 2024 12:10
@zecakeh
Add changelog
b79a5b9 
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@turt2live turt2live mentioned this pull request Feb 25, 2024
Merged
turt2live
turt2live requested changes Feb 25, 2024
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

otherwise lgtm generally

content/client-server-api/modules/instant_messaging.md Outdated Show resolved Hide resolved
@zecakeh
Use s HTML tag in example
46c8763 
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
@zecakeh
Move changed-in annotation
5fb91e9 
Signed-off-by: Kévin Commaille <zecakeh@tedomum.fr>
turt2live
turt2live approved these changes Feb 26, 2024
View reviewed changes
Copy link
Member

@turt2live turt2live left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@turt2live turt2live merged commit 4cfe2fb into matrix-org:main Feb 26, 2024
12 checks passed
@zecakeh zecakeh deleted the msc2530 branch February 26, 2024 22:19
@zecakeh zecakeh mentioned this pull request Feb 27, 2024
Closed
28 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@turt2live turt2live turt2live approved these changes

@tulir tulir tulir approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@zecakeh @turt2live @tulir