Claire 33d30632fb Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/public_feed.rb`: Upstream refactored a bit, glitch-soc had specific code for local-only statuses. Updated glitch-soc's specific code accordingly.		2021-01-11 11:55:42 +01:00
..
activitypub
account_relationships_presenter.rb
initial_state_presenter.rb
instance_presenter.rb
status_relationships_presenter.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00