You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

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.		4 years ago
..
activitypub	Add E2EE API (#13820)	5 years ago
account_relationships_presenter.rb	Add user notes on accounts (#14148)	4 years ago
initial_state_presenter.rb	Add visibility parameter in share page (#13023)	5 years ago
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
status_relationships_presenter.rb	Optimize map { ... }.compact calls (#15513)	4 years ago