Thibaut Girka 12dae9d583 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - app/models/form/admin_settings.rb - config/locales/ja.yml		2019-04-01 21:28:31 +02:00
..
activitypub	…
account_relationships_presenter.rb	Hide blocking accounts from blocked users (#10442)	2019-04-01 20:06:13 +02:00
initial_state_presenter.rb	…
instance_presenter.rb	…
status_relationships_presenter.rb	…