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 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		6 years ago
..
activitypub	Improved remote thread fetching (#10106)	6 years ago
account_relationships_presenter.rb	Hide blocking accounts from blocked users (#10442)	6 years ago
initial_state_presenter.rb	…
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