hometown/app/views/disputes/strikes
nachtjasmin dbf4adb848
Merge tag 'v4.1.0rc1' into lets-bump-hometown-to-mastodon-4.2
There were quite a couple of conflicts, they were resolved in the
following manner:

- Translations: Moved to "publish" as translation, aligns with other
  languages
- Options: `trends_as_landing_page` is kept false
- UI: clicking the display name opens the original profile

Potential problems:

1. Not all translations for mails and stuff are prefixed with
   `%{title}`, some are, some are hardcoded to `Mastodon`.
2023-11-16 22:31:22 +01:00
..
index.html.haml Change old moderation strikes to be displayed in a separate page (#17566) 2022-03-01 19:37:47 +01:00
show.html.haml Merge tag 'v4.1.0rc1' into lets-bump-hometown-to-mastodon-4.2 2023-11-16 22:31:22 +01:00