Claire 997553a99e Merge branch 'main' into glitch-soc/merge-upstream ... Conflicts: - `app/views/admin/announcements/edit.html.haml`: Upstream change too close to theming-related glitch-soc change. Ported upstream changes. - `app/views/admin/announcements/new.html.haml` Upstream change too close to theming-related glitch-soc change. Ported upstream changes.		2022-11-14 08:35:55 +01:00
..
admin	Fix role_ids not accepting arrays in admin API (#20625)	2022-11-14 06:56:15 +01:00
filters	Move V2 Filter methods under /api/v2 prefix (#20622)	2022-11-14 08:34:07 +01:00
filters_controller.rb	Revamp post filtering system (#18058)	2022-06-28 09:42:13 +02:00
instances_controller.rb	Add server banner to web app, add GET /api/v2/instance to REST API (#19294)	2022-10-09 19:51:39 +02:00
media_controller.rb	Change post-processing to be deferred only for large media types (#19617)	2022-11-01 15:27:58 +01:00
search_controller.rb	Merge branch 'main' into glitch-soc/merge-upstream	2022-10-28 19:23:58 +02:00
suggestions_controller.rb	Add cold-start follow recommendations (#15945)	2021-04-12 12:37:14 +02:00