mirror of
https://github.com/lunaisnotaboy/mastodon.git
synced 2024-12-30 00:56:52 +00:00
be493b6c0d
Conflicts: - `app/models/account.rb`: Not a real conflict, just upstream getting rid of unused constants too close to glitch-soc-specific contents. Removed unused constants like upstream did. - `app/models/trends.rb`: Conflict because glitch-soc disabled email notifications for trending links. Upstream has refactored this quite a bit and added trending posts. Took upstream code, but disabling the extra trending stuff will come in another commit. - `app/views/admin/trends/links/index.html.haml`: Conflict due to glitch-soc's theming system. Ported upstream changes accordingly. |
||
|---|---|---|
| .. | ||
| migrate | ||
| post_migrate | ||
| views | ||
| schema.rb | ||
| seeds.rb | ||