mastodon-docker-playground/app/helpers/admin
Claire f224237862 Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `db/schema.rb`:
  Conflict due to glitch-soc adding the `content_type` column on status edits
  and thus having a different schema version number.
  Solved by taking upstream's schema version number, as it is higher than
  glitch-soc's.
2022-02-17 10:58:44 +01:00
..
trends Add appeals (#17364) 2022-02-14 21:27:53 +01:00
account_moderation_notes_helper.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
action_logs_helper.rb Add appeals (#17364) 2022-02-14 21:27:53 +01:00
announcements_helper.rb Add announcements (#12662) 2020-01-23 22:00:13 +01:00
dashboard_helper.rb Fix admin interface crash when displaying deleted user (#17301) 2022-01-16 20:57:37 +01:00
filter_helper.rb Add notifications for statuses deleted by moderators (#17204) 2022-01-17 09:41:33 +01:00
settings_helper.rb Add optional hCaptcha support 2022-01-24 21:22:13 +01:00