mirror of
https://github.com/mastodon/mastodon.git
synced 2025-01-21 01:21:41 +01:00
9adeaf2bfc
Conflicts: - `app/controllers/statuses_controller.rb`: Minor conflict due to theming system