about summary refs log tree commit diff
path: root/app/mailers
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2022-10-30 18:15:28 +0100
committerClaire <claire.github-309c@sitedethib.com>2022-10-30 18:15:28 +0100
commiteee36267d627ae08898d2b3301f56ce729055e82 (patch)
treedae581a9867b8dcdd2c3ab0154794a1ff10ad98e /app/mailers
parent26ff48ee48a5c03a2a4b0bd03fd322529e6bd960 (diff)
parentac9fb0d654440ce1179bab4071941450aa994d2c (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts:
- `app/javascript/mastodon/locales/ja.json`:
  Upstream change too close to a glitch-soc-specific string.
  The glitch-soc-specific string should not have been in this file, so it
  has been moved to `app/javascript/flavours/glitch/locales/ja.js`.
- `app/javascript/packs/public.js`:
  Upstream refactored a part, that as usual is split and duplicated in various
  pack files. Updated those pack files accordingly.
- `app/views/layouts/application.html.haml`:
  Upstream fixed custom.css path in a different way than we did, went with
  upstream's change.
Diffstat (limited to 'app/mailers')
0 files changed, 0 insertions, 0 deletions