mirror of
https://github.com/glitch-soc/mastodon.git
synced 2025-01-15 12:13:18 -05:00
b9f351d845
Conflicts: - `app/javascript/mastodon/actions/compose.js`: Not a “real” conflict, but change too close to a change we made to fix the vanilla WebUI locally pushing authored local-only toots in the public TL view.