mirror of
https://github.com/glitch-soc/mastodon.git
synced 2024-11-27 02:24:03 -05:00
fef055db96
Conflicts: - `spec/requests/api/v1/timelines/tag_spec.rb`: Upstream refactored this file, while we had a change to switch a default setting. Updated as upstream did. - `spec/views/statuses/show.html.haml_spec.rb`: Upstream refactored this file, while we stubbed different methods. Updated as upstream did, and updated the stubs accordingly. |
||
---|---|---|
.. | ||
cli | ||
migration_helpers.rb | ||
migration_warning.rb | ||
rack_middleware.rb | ||
redis_configuration.rb | ||
sidekiq_middleware.rb | ||
snowflake.rb | ||
version.rb |