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 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.		2 years ago
..
account_action.rb	Fix account action type validation (#19476)	2 years ago
action_log.rb	Add audit log entries for user roles (#19040)	2 years ago
action_log_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago
appeal_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago
import.rb	Allow import/export of instance-level domain blocks/allows (#1754)	3 years ago
status_batch_action.rb	Fix reblogs being discarded after the reblogged status (#19731)	2 years ago
status_filter.rb	Fix error when passing unknown filter param in REST API (#20626)	2 years ago