kyori19
c15001381b
Merge remote-tracking branch 'tootsuite/main' into custom/quote
# Conflicts:
# app/controllers/api/v1/statuses_controller.rb
# app/javascript/mastodon/actions/compose.js
# app/javascript/mastodon/actions/notifications.js
# app/javascript/mastodon/components/status_action_bar.js
# app/javascript/mastodon/containers/status_container.js
# app/javascript/mastodon/features/compose/containers/reply_indicator_container.js
# app/javascript/mastodon/reducers/compose.js
2022-02-27 02:32:06 +00:00
..
2020-09-15 09:24:24 +02:00
2021-10-14 21:04:26 +02:00
2022-02-27 02:32:06 +00:00
2021-03-19 20:23:32 +01:00
2019-07-07 16:16:51 +02:00
2018-04-21 21:35:55 +02:00
2022-01-17 09:41:33 +01:00
2018-05-25 18:36:26 +02:00