Claire
|
c59fb65ddc
|
Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream
Conflicts:
- `app/helpers/accounts_helper.rb`:
Conflict due to glitch-soc's option to hide followers count.
Ported upstream changes.
Additional changes:
- `app/views/application/mailer/_account.html.haml`:
Ported glitch-soc's option to hide followers count.
- `app/views/settings/flavours/show.html.haml`:
Ported the `frontend_asset_url` helper change to glitch-soc.
|
2024-01-17 18:32:15 +01:00 |
|
HTeuMeuLeu
|
1a3859d8e2
|
Update follow and follow_request emails (#28755)
Co-authored-by: Claire <claire.github-309c@sitedethib.com>
|
2024-01-17 14:37:04 +00:00 |
|
Renaud Chaput
|
cb5ac15923
|
Use a helper to avoid using media/ asset prefixes (#28756)
|
2024-01-17 12:19:51 +00:00 |
|
HTeuMeuLeu
|
7f471e70c0
|
Update new email templates (#28416)
Co-authored-by: Matt Jankowski <matt@jankowski.online>
|
2024-01-15 18:18:59 +00:00 |
|