4 commits

Author	SHA1	Message	Date
Jeremy Kescher	24e9a23fe6	Merge remote-tracking branch 'upstream/main' into develop, bump version ... Conflicts: - .github/workflows/build-image.yml We're not building an image with GitHub Actions.	2023-03-17 07:27:28 +01:00
PauloVilarinho	8770473dbb	add modal message when editing toot (#23936) ... Co-authored-by: PauloVilarinho <paulotarsobranco@hotmail.com>	2023-03-06 17:33:09 +01:00
Jeremy Kescher	7318b74ebf	Merge remote-tracking branch 'upstream/main' into develop ... # Conflicts: # Gemfile.lock # app/models/notification.rb # config/locales/simple_form.de.yml	2023-03-05 12:34:16 +01:00
Renaud Chaput	44a7d87cb1	Rename JSX files with proper .jsx extension (#23733)	2023-02-20 03:20:59 +01:00

Renamed from app/javascript/mastodon/containers/status_container.js (Browse further)