Claire be493b6c0d Merge branch 'main' into glitch-soc/merge-upstream ... 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.		2022-02-26 09:29:23 +01:00
..
activitypub	Fix Undo Announce sometimes inlining the originally Announced status (#17516)	2022-02-11 14:52:07 +01:00
account_relationships_presenter.rb	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
initial_state_presenter.rb
instance_presenter.rb	Merge branch 'main' into glitch-soc/merge-upstream	2021-10-14 21:44:57 +02:00
status_relationships_presenter.rb	Fix unable to unpin follower-only posts (#17647)	2022-02-25 17:04:08 +01:00