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 07eb31eeac Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/views/admin/settings/edit.html.haml: Conflict due to how the theming settings change.		6 years ago
..
activitypub	Improved remote thread fetching (#10106)	6 years ago
account_relationships_presenter.rb	Public profile endorsements (accounts picked by profile owner) (#8146)	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