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 694c073d1f Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/controllers/admin/dashboard_controller.rb`: Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram. - `app/views/admin/dashboard/index.html.haml` Upstream completely redesigned the admin dashboard. glitch-soc tracked extra features, but that list is gone. Followed upstram.		3 years ago
..
activitypub	Add E2EE API (#13820)	5 years ago
account_relationships_presenter.rb	Add user notes on accounts (#14148)	4 years ago
initial_state_presenter.rb	Add visibility parameter in share page (#13023)	5 years ago
instance_presenter.rb	Merge branch 'main' into glitch-soc/merge-upstream	3 years ago
status_relationships_presenter.rb	Use Enumerable#filter_map in more places (#15527)	4 years ago