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. |
||
|---|---|---|
| .. | ||
| aliases | ||
| applications | ||
| deletes | ||
| exports | ||
| featured_tags | ||
| flavours | ||
| imports | ||
| login_activities | ||
| migration/redirects | ||
| migrations | ||
| preferences | ||
| privacy | ||
| profiles | ||
| shared | ||
| two_factor_authentication | ||
| two_factor_authentication_methods | ||
| verifications | ||