Claire 77a975a964 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	Add E2EE API (#13820)	2020-06-02 19:24:53 +02:00
account_relationships_presenter.rb	Add user notes on accounts (#14148)	2020-06-30 19:19:50 +02:00
initial_state_presenter.rb	Add visibility parameter in share page (#13023)	2020-06-09 00:16:30 +02:00
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2020-12-15 14:27:06 +01:00
status_relationships_presenter.rb	Optimize map { ... }.compact calls (#15513)	2021-01-10 00:32:01 +01:00