mirror of
https://github.com/funamitech/mastodon
synced 2024-12-05 10:18:45 +09:00
360590ecd8
Conflicts: - `app/controllers/accounts_controller.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. - `app/lib/account_statuses_filter.rb`: Conflict due to glitch-soc's local-only posting feature. Refactored as upstream did but kept local changes. |
||
---|---|---|
.. | ||
counters_spec.rb | ||
finder_concern_spec.rb | ||
interactions_spec.rb | ||
statuses_search_spec.rb |