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.

2019-03-14 17:17:20 +01:00

..

account_relationships_presenter_spec.rb

Add tests for AccountRelationshipsPresenter (#5805)

2017-11-24 14:41:04 +01:00

instance_presenter_spec.rb

Merge branch 'master' into glitch-soc/merge-upstream

2019-03-14 17:17:20 +01:00