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 f8e07ca5cd Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/status.rb Resolved by taking both changes (not a real conflict, just changes too close to each other).		6 years ago
..
activitypub	Better pagination for ActivityPub outbox (#7356)	7 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