You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Claire e4f8679eae Merge branch 'master' into glitch-soc/merge-upstream ... Conflicts: - `app/models/form/admin_settings.rb`: New setting added upstream. Ported it. - `app/views/statuses/_simple_status.html.haml`: Upstream removed RTL classes. Did the same. - `config/settings.yml`: New setting added upstream. Ported it.		4 years ago
..
activitypub	…
account_relationships_presenter.rb	Add user notes on accounts (#14148)	4 years ago
initial_state_presenter.rb	Add visibility parameter in share page (#13023)	4 years ago
instance_presenter.rb	Merge branch 'master' into glitch-soc/merge-upstream	4 years ago
status_relationships_presenter.rb	…