Thibaut Girka 5c8f9a3220 Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - config/locales/pl.yml Conflict caused by new upstream string too close to glitch-specific “flavour” string. Took both strings.		2019-04-08 15:57:56 +02:00
..
activitypub	Improved remote thread fetching (#10106)	2019-02-28 15:22:21 +01:00
account_relationships_presenter.rb	Improve blocked view of profiles (#10491)	2019-04-07 04:59:13 +02:00
initial_state_presenter.rb	…
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	2019-04-08 15:57:56 +02:00
status_relationships_presenter.rb	…