mirror of https://github.com/Siphonay/mastodon
0d69cc068c
Conflicts: - `app/javascript/styles/mastodon/components.scss`: Conflict caused by glitch-soc changing the path to images, and upstream removing styling using such an image. Removed the styling as upstream did. - `app/models/trends/statuses.rb`: Upstream added a date restriction to trendable posts, while glitch-soc had slightly different conditions. Added the date restriction to glitch-soc's conditions. |
||
|---|---|---|
| .. | ||
| cli | ||
| migration_helpers.rb | ||
| migration_warning.rb | ||
| rack_middleware.rb | ||
| redis_configuration.rb | ||
| sidekiq_middleware.rb | ||
| snowflake.rb | ||
| version.rb | ||