You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
mastodon/spec/presenters
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
..
account_relationships_presenter_spec.rb
instance_presenter_spec.rb Merge branch 'master' into glitch-soc/merge-upstream 6 years ago