Thibaut Girka bf1d3ae3b8 Merge branch 'master' into glitch-soc/merge-upstream ...

Conflicts:
	config/settings.yml

2018-08-01 22:20:25 +02:00

..

activitypub

…

account_relationships_presenter.rb

…

initial_state_presenter.rb

…

instance_presenter.rb

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

2018-08-01 22:20:25 +02:00

status_relationships_presenter.rb

…