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.

Thibaut Girka 1f70b51fff Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/es.yml - config/locales/pl.yml - config/locales/pt-BR.yml		6 years ago
..
activitypub	Improved remote thread fetching (#10106)	6 years ago
account_relationships_presenter.rb	Add `blocked_by` relationship to the REST API (#10373)	6 years ago
initial_state_presenter.rb	Add protocol handler. Handle follow intents (#4511)	7 years ago
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	6 years ago
status_relationships_presenter.rb	Add backend support for bookmarks	7 years ago