This repository has been archived on 2024-07-22. You can view files and clone it, but cannot push or open issues or pull requests.

Thibaut Girka f5f6d23d55 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	…
account_relationships_presenter.rb	…
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	…