mirrors/catstodon
1
0
Fork 0
mirror of https://git.kescher.at/CatCatNya/catstodon.git synced 2024-11-29 16:39:04 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
catstodon/app/views/application/mailer
History
Claire 6281c4dedd Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
2024-10-19 19:13:32 +02:00
..
_account.html.haml Merge commit '127503eb2cdd67126974bee304dde0f183300b84' into glitch-soc/merge-upstream 2024-01-17 18:32:15 +01:00
_button.html.haml New welcome email (#28883) 2024-03-01 12:16:53 +00:00
_checklist.html.haml Simplify checklist step loop in welcome mailer (#29761) 2024-03-28 10:56:33 +00:00
_feature.html.haml Use partial collection render for welcome mailer features (#29843) 2024-04-04 16:13:10 +00:00
_follow.html.haml New welcome email (#28883) 2024-03-01 12:16:53 +00:00
_frame.html.haml Update new email templates (#28416) 2024-01-15 18:18:59 +00:00
_hashtag.html.haml Fix broken i18n in text welcome mailer tags area (#32571) 2024-10-18 07:19:37 +00:00
_heading.html.haml Update new email templates (#28416) 2024-01-15 18:18:59 +00:00